minicron 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d5c6fda70a68b9ecfa2a36e281149e13698d24
-  data.tar.gz: 218a1309dac82cea4a52b68b9b439a828282c71d
+  metadata.gz: 8beedf57f7517a90ad68fd04abaf1347e5177b0a
+  data.tar.gz: bf0e6d8066735370e60e2d794b71a169b6267576
 SHA512:
-  metadata.gz: ddea0612497a763de534ba45b673e88f3323a5d0073a8b9dbf157e1d017dba51aeefb03f11f546e0b2cbcd49cacdc5a6af5cf01d4c3755b46ee796dac3d95920
-  data.tar.gz: 1191ed1757310c295be9c4febe73e9de77e0808e5bb6e29f40affa6cd80a9ad94bf20f94dfde76baaefaf7cfaad7055beaad9c192d328b3bc992638cd7418d14
+  metadata.gz: 279dc982408b2e56f9613a3d66b8da70369fdff48f8301ad30501653120dd038146fc13201c3c7de234612055dcdb93d2651a50689e5a6649314c6d7c63cabad
+  data.tar.gz: 57cb3018551c0c9ad8f5bdb2ff5f3caecadcb94eb2c28b0f08ce61df27ea9ef7a19ad89bb8a57bd21b8d92f6953f439ebdf425e33adc4acf1cf25210bbf29d04

data/README.md

@@ -78,7 +78,7 @@ Requirements
 These databases are also supported but you will need to manaually install the gems for them
 
 - MySQL via mysql2 (See [here](https://github.com/brianmario/mysql2#compatibility) for compatability info)
-- Support for PostgreSQL is planned in the future
+- PostgreSQL via pg (See [here](https://bitbucket.org/ged/ruby-pg/wiki/Home) for compatibility info)
 
 #### Web Server / Reverse Proxy
 
@@ -107,7 +107,7 @@ but I encourage you to give it a try in a non critical environment and help me t
 
 2. On some distributions you may need to install the ````ruby-dev```` and ````build-essential```` packages
 
-3. To install the latest release (currently 0.7.8) you can ````gem install minicron````, depending on your ruby setup
+3. To install the latest release (currently 0.7.9) you can ````gem install minicron````, depending on your ruby setup
    you may need to run this with ````sudo````
 
 4. Set your database configuration options in ````/etc/minicron.toml````, you can use the [minicron.toml](https://github.com/jamesrwhite/minicron/blob/master/config/minicron.toml) as a guide on what options are configurable

data/lib/minicron/constants.rb

@@ -1,6 +1,6 @@
 # The minicron module
 module Minicron
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
   DEFAULT_CONFIG_FILE = '/etc/minicron.toml'
   BASE_PATH = File.expand_path('../../../', __FILE__)
   LIB_PATH = File.expand_path('../../', __FILE__)

data/lib/minicron/hub/app.rb

@@ -95,9 +95,9 @@ module Minicron::Hub
     def self.setup_db
       # Configure the database
       case Minicron.config['database']['type']
-      when 'mysql'
+      when /mysql|postgresql/
         set :database,
-            :adapter => 'mysql2',
+            :adapter => Minicron.config['database']['type'],
             :host => Minicron.config['database']['host'],
             :database => Minicron.config['database']['database'],
             :username => Minicron.config['database']['username'],

data/lib/minicron/hub/db/schema.pg.sql

@@ -0,0 +1,567 @@
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+
+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- Name: alerts; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE alerts (
+    id integer NOT NULL,
+    job_id integer NOT NULL,
+    execution_id integer,
+    schedule_id integer,
+    kind character varying(4) DEFAULT ''::character varying NOT NULL,
+    expected_at timestamp without time zone,
+    medium character varying(9) DEFAULT ''::character varying NOT NULL,
+    sent_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: alerts_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE alerts_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: alerts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE alerts_id_seq OWNED BY alerts.id;
+
+
+--
+-- Name: executions; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE executions (
+    id integer NOT NULL,
+    job_id integer NOT NULL,
+    number integer NOT NULL,
+    created_at timestamp without time zone NOT NULL,
+    started_at timestamp without time zone,
+    finished_at timestamp without time zone,
+    exit_status integer
+);
+
+
+--
+-- Name: executions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE executions_id_seq                                                                                                                                                                                                                                                               [398/1845]
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: executions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE executions_id_seq OWNED BY executions.id;
+
+
+--
+-- Name: hosts; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE hosts (
+    id integer NOT NULL,
+    name character varying,
+    fqdn character varying DEFAULT ''::character varying NOT NULL,
+    "user" character varying(32) DEFAULT ''::character varying NOT NULL,
+    host character varying DEFAULT ''::character varying NOT NULL,
+    port integer NOT NULL,
+    public_key text,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: hosts_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE hosts_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: hosts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE hosts_id_seq OWNED BY hosts.id;
+
+
+--
+-- Name: job_execution_outputs; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE job_execution_outputs (
+    id integer NOT NULL,
+    execution_id integer NOT NULL,
+    seq integer NOT NULL,
+    output text NOT NULL,
+    "timestamp" timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: job_execution_outputs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE job_execution_outputs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: job_execution_outputs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE job_execution_outputs_id_seq OWNED BY job_execution_outputs.id;
+
+
+--
+-- Name: jobs; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE jobs (
+    id integer NOT NULL,
+    host_id integer NOT NULL,
+    job_hash character varying(32) DEFAULT ''::character varying NOT NULL,
+    name character varying,
+    "user" character varying(32) NOT NULL,
+    command text NOT NULL,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: jobs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jobs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: jobs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE jobs_id_seq OWNED BY jobs.id;
+
+
+--
+-- Name: schedules; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE schedules (
+    id integer NOT NULL,
+    job_id integer NOT NULL,
+    minute character varying(169),
+    hour character varying(61),
+    day_of_the_month character varying(83),
+    month character varying(26),
+    day_of_the_week character varying(13),
+    special character varying(9),
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+--
+-- Name: schedules_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE schedules_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: schedules_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE schedules_id_seq OWNED BY schedules.id;
+
+
+--
+-- Name: schema_migrations; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE schema_migrations (
+    version character varying NOT NULL
+);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY alerts ALTER COLUMN id SET DEFAULT nextval('alerts_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY executions ALTER COLUMN id SET DEFAULT nextval('executions_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY hosts ALTER COLUMN id SET DEFAULT nextval('hosts_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY job_execution_outputs ALTER COLUMN id SET DEFAULT nextval('job_execution_outputs_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jobs ALTER COLUMN id SET DEFAULT nextval('jobs_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY schedules ALTER COLUMN id SET DEFAULT nextval('schedules_id_seq'::regclass);
+
+
+--
+-- Name: alerts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('alerts_id_seq', 1, false);
+
+
+--
+-- Name: executions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('executions_id_seq', 1, false);
+
+
+--
+-- Name: hosts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('hosts_id_seq', 1, false);
+
+
+--
+-- Name: job_execution_outputs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('job_execution_outputs_id_seq', 1, false);
+
+
+--
+-- Name: jobs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('jobs_id_seq', 1, false);
+
+
+--
+-- Name: schedules_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
+--
+
+SELECT pg_catalog.setval('schedules_id_seq', 1, false);
+
+
+--
+-- Data for Name: schema_migrations; Type: TABLE DATA; Schema: public; Owner: -
+--
+
+COPY schema_migrations (version) FROM stdin;
+0
+\.
+
+
+--
+-- Name: alerts_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY alerts
+    ADD CONSTRAINT alerts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: executions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY executions
+    ADD CONSTRAINT executions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: hosts_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY hosts
+    ADD CONSTRAINT hosts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: job_execution_outputs_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY job_execution_outputs
+    ADD CONSTRAINT job_execution_outputs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: jobs_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY jobs
+    ADD CONSTRAINT jobs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: schedules_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY schedules
+    ADD CONSTRAINT schedules_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: alerts_execution_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX alerts_execution_id ON alerts USING btree (execution_id);
+
+
+--
+-- Name: alerts_job_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX alerts_job_id ON alerts USING btree (job_id);
+
+
+--
+-- Name: day_of_the_month; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX day_of_the_month ON schedules USING btree (day_of_the_month);
+
+
+--
+-- Name: day_of_the_week; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX day_of_the_week ON schedules USING btree (day_of_the_week);
+
+
+--
+-- Name: executions_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX executions_created_at ON executions USING btree (created_at);
+
+
+--
+-- Name: executions_job_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX executions_job_id ON executions USING btree (job_id);
+
+
+--
+-- Name: expected_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX expected_at ON alerts USING btree (expected_at);
+
+
+--
+-- Name: finished_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX finished_at ON executions USING btree (finished_at);
+
+
+--
+-- Name: host_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX host_id ON jobs USING btree (host_id);
+
+
+--
+-- Name: hostname; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX hostname ON hosts USING btree (fqdn);
+
+
+--
+-- Name: hour; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX hour ON schedules USING btree (hour);
+
+
+--
+-- Name: job_execution_outputs_execution_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX job_execution_outputs_execution_id ON job_execution_outputs USING btree (execution_id);
+
+
+--
+-- Name: job_hash; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX job_hash ON jobs USING btree (job_hash);
+
+
+--
+-- Name: jobs_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX jobs_created_at ON jobs USING btree (created_at);
+
+
+--
+-- Name: kind; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX kind ON alerts USING btree (kind);
+
+
+--
+-- Name: medium; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX medium ON alerts USING btree (medium);
+
+
+--
+-- Name: minute; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX minute ON schedules USING btree (minute);
+
+
+--
+-- Name: month; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX month ON schedules USING btree (month);
+
+
+--
+-- Name: schedule_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX schedule_id ON alerts USING btree (schedule_id);
+
+
+--
+-- Name: schedules_job_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX schedules_job_id ON schedules USING btree (job_id);
+
+
+--
+-- Name: seq; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX seq ON job_execution_outputs USING btree (seq);
+
+
+--
+-- Name: special; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX special ON schedules USING btree (special);
+
+
+--
+-- Name: started_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX started_at ON executions USING btree (started_at);
+
+
+--
+-- Name: unique_number_per_job; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX unique_number_per_job ON executions USING btree (job_id, number);
+
+
+--
+-- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (version);
+
+
+--
+-- PostgreSQL database dump complete
+--

data/lib/minicron/monitor.rb

@@ -17,10 +17,10 @@ module Minicron
     # Establishes a database connection
     def setup_db
       case Minicron.config['database']['type']
-      when 'mysql'
+      when /mysql|postgres/
         # Establish a database connection
         ActiveRecord::Base.establish_connection(
-          :adapter => 'mysql2',
+          :adapter => Minicron.config['database']['type'],
           :host => Minicron.config['database']['host'],
           :database => Minicron.config['database']['database'],
           :username => Minicron.config['database']['username'],
@@ -103,9 +103,11 @@ module Minicron
       # Parse the cron expression
       cron = CronParser.new(schedule.formatted)
 
-      # Find the time the cron was last expected to run
-      expected_at = cron.last(Time.now)
-      expected_by = expected_at + 60
+      # Find the time the cron was last expected to run with a 30 second pre buffer
+      # and a 30 second post buffer (in addition to the 60 already in place) incase
+      # jobs run early/late to allow for clock sync differences between client/hub
+      expected_at = cron.last(Time.now) - 30
+      expected_by = expected_at + 30 + 60 + 30 # pre buffer + minute wait + post buffer
 
       # We only need to check jobs that are expected to under the monitor start time
       # and jobs that have passed their expected by time and the time the schedule

data/spec/valid_config.toml

@@ -24,8 +24,8 @@ cron_file = "/etc/crontab"
 
 # Database options
 [database]
-type = "sqlite" # [mysql, sqlite]
-# The options below are for mysql only
+type = "sqlite" # [mysql, postgresql, sqlite]
+# The options below are for mysql and postgresql only
 # host = "127.0.0.1"
 # database = "minicron"
 # username = "minicron"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minicron
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - James White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -615,6 +615,7 @@ files:
 - lib/minicron/hub/controllers/api/jobs.rb
 - lib/minicron/hub/controllers/api/schedule.rb
 - lib/minicron/hub/controllers/index.rb
+- lib/minicron/hub/db/schema.pg.sql
 - lib/minicron/hub/db/schema.rb
 - lib/minicron/hub/db/schema.sql
 - lib/minicron/hub/models/alert.rb
@@ -684,7 +685,7 @@ requirements:
 - ruby-dev (you may need this to be able to install eventmachine)
 - build-essential (you may need this to be able to install eventmachine)
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A system to make it easier to manage and monitor cron jobs