rearview 1.0.3.rc.3-jruby → 1.0.3.rc.4-jruby

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d18574480d2cb164b05a399d03d8471f0a2eb86
-  data.tar.gz: 536a96e7c77dbdd0249713fa36fcd2e5b1a54cf1
+  metadata.gz: 1801238546921f09bd33e3a81516867ff5a4d73e
+  data.tar.gz: a64de87d9f977c2fdc88d0e95450c630ca82dadf
 SHA512:
-  metadata.gz: e7894d65ca93d5e9ffd6b9a82e325b21a267806bc7a83ade90883063c8150a8a450a5bfe5f04629d0fd0652a4e1eca58e04bf58fcbc2bc09f2f576e87b826916
-  data.tar.gz: eec2f7f6dbb2f9a290534408c6cc8faa5d3e2281934f7f87f466f97acc54b3a133ede123a17b6ec22dc387e44727d3ed5fd178728f8356aca291b378c1bd1de6
+  metadata.gz: 2a5aa2242148ddf22b6a5bd39b6c65f6e42acd9735d1acdf677ec91d7a227040dd10e246814ec4ce438b54d3c2e64fa22edfc3d2c4e164eb33343f52d7883299
+  data.tar.gz: 7e197973fdfa99f1cbf6fc511564d44af39950c10b2b93ea45d0f2a370fdc5fbe25f1677b8dc1178000db8c4f5d8cdbd44906cb1b75f1f47522b4a508b7d26d2

data/app/models/rearview/job.rb

@@ -139,7 +139,6 @@ module Rearview
     end
 
     def create_associated_event(transition)
-      logger.debug "#{self}#create_associated_event for transition #{transition.inspect}"
       report_transition(transition)
       job_error_attrs = {}
       job_error_attrs.merge!(event_data[:job_error]) if event_data.try(:[],:job_error)
@@ -148,7 +147,6 @@ module Rearview
     end
 
     def update_associated_event(transition)
-      logger.debug "#{self}#update_associated_event for transition #{transition.inspect}"
       report_transition(transition)
       job_error = Rearview::JobError.latest_entry(self)
       if job_error.present?

data/app/models/rearview/job_error.rb

@@ -101,14 +101,12 @@ module Rearview
     end
 
     def create_alert(transition)
-      logger.debug "#{self}#create_alert for transition #{transition.inspect}"
       Rearview::AlertsHandler.new(self.job,event_data[:monitor_results]).run
       self.last_alerted_at = Time.now.utc
       save!
     end
 
     def update_alert(transition)
-      logger.debug "#{self}#update_alert for transition #{transition.inspect}"
       if !self.last_alerted_at || Time.now.utc >= self.last_alerted_at.utc + self.job.error_timeout.minutes
         Rearview::AlertsHandler.new(self.job,event_data[:monitor_results]).run
         self.last_alerted_at = Time.now.utc

data/lib/rearview/alerts_handler.rb

@@ -24,11 +24,6 @@ module Rearview
       logger.error "#{self} failed: #{$!}\n#{$@.join("\n")}"
       self
     end
-
-    def to_s
-      "#{super.to_s} [jobId:#{@job.id} threadId:#{java.lang.Thread.currentThread.getId} threadName:#{java.lang.Thread.currentThread.getName}]"
-    end
-
   end
 end
 

data/lib/rearview/log_formatter.rb

@@ -0,0 +1,40 @@
+# copied from logger.rb
+module Rearview
+  class LogFormatter
+    Format = "%s, [%s#%d/%s] %5s -- %s: %s\n"
+
+    attr_accessor :datetime_format
+
+    def initialize
+      @datetime_format = nil
+    end
+
+    def call(severity, time, progname, msg)
+      thread_name = java.lang.Thread.currentThread.getName
+      default_name = ( progname.present? ? progname : "Rearview" )
+      Format % [severity[0..0],format_datetime(time),$$,thread_name,severity,default_name,msg2str(msg)]
+    end
+
+  private
+
+    def format_datetime(time)
+      if @datetime_format.nil?
+        time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
+      else
+        time.strftime(@datetime_format)
+      end
+    end
+
+    def msg2str(msg)
+      case msg
+      when ::String
+        msg
+      when ::Exception
+        "#{ msg.message } (#{ msg.class })\n" <<
+          (msg.backtrace || []).join("\n")
+      else
+        msg.inspect
+      end
+    end
+  end
+end

data/lib/rearview/monitor_runner.rb

@@ -268,10 +268,6 @@ module Rearview
         [from,to]
       end
 
-      def to_s
-        "#{super.to_s} [threadId:#{java.lang.Thread.currentThread.getId} threadName:#{java.lang.Thread.currentThread.getName}]"
-      end
-
     end
   end
 end

data/lib/rearview/monitor_supervisor.rb

@@ -46,9 +46,6 @@ module Rearview
     def self.task_sym(job)
       "job_#{job.id}".to_sym
     end
-    def to_s
-      "#{super.to_s} [threadId:#{java.lang.Thread.currentThread.getId} threadName:#{java.lang.Thread.currentThread.getName}]"
-    end
   end
 end
 

data/lib/rearview/monitor_task.rb

@@ -4,16 +4,16 @@ module Rearview
   class MonitorTask
     class MonitorTaskError < StandardError; end;
     include Celluloid
-    include Celluloid::Logger
+    include Rearview::Logger
     attr_reader :job,:timer,:initial_delay
     def initialize(job,initial_delay=0,start=true)
-      debug "#{self} intialize initial_delay:#{initial_delay} start:#{start}"
+      logger.debug "#{self} intialize initial_delay:#{initial_delay} start:#{start}"
       @job = job
       @initial_delay = initial_delay
       schedule if start
     end
     def schedule
-      debug "#{self} schedule"
+      logger.debug "#{self} schedule"
       if ActiveRecord::Base.connection_pool.active_connection?
         ActiveRecord::Base.connection_pool.release_connection
       end
@@ -22,11 +22,11 @@ module Rearview
         @timer.cancel
       end
       delay = @job.delay + @initial_delay
-      debug "#{self} next run in #{delay}s"
+      logger.debug "#{self} next run in #{delay}s"
       @timer = after(delay) { self.run }
     end
     def run
-      debug "#{self} run"
+      logger.debug "#{self} run"
       @initial_delay = 0
       result = Rearview::MonitorRunner.run(@job.metrics, @job.monitor_expr, @job.minutes)
       ActiveRecord::Base.connection_pool.with_connection do
@@ -34,7 +34,7 @@ module Rearview
         Rearview::ResultsHandler.new(@job,result).run
       end
     rescue
-      error "#{self} run failed: #{$!}\n#{$@.join("\n")}"
+      logger.error "#{self} run failed: #{$!}\n#{$@.join("\n")}"
       ActiveRecord::Base.connection_pool.with_connection do
         @job.last_run = Time.now.utc
         @job.error!
@@ -42,9 +42,6 @@ module Rearview
     ensure
       schedule
     end
-    def to_s
-      "#{super.to_s} [jobId:#{self.job.try(:id)||'nil'} threadId:#{java.lang.Thread.currentThread.getId} threadName:#{java.lang.Thread.currentThread.getName}]"
-    end
   end
 end
 

data/lib/rearview/results_handler.rb

@@ -32,7 +32,4 @@ module Rearview
       self
     end
   end
-  def to_s
-    "#{super.to_s} [jobId:#{@job.id} threadId:#{java.lang.Thread.currentThread.getId} threadName:#{java.lang.Thread.currentThread.getName}]"
-  end
 end

data/lib/rearview/stats_task.rb

@@ -4,7 +4,7 @@ module Rearview
   class StatsTask
     class StatsTaskError < StandardError; end;
     include Celluloid
-    include Celluloid::Logger
+    include Rearview::Logger
     attr_reader :delay, :statsd
     def initialize(delay=120,start=true)
       @delay = delay
@@ -20,12 +20,12 @@ module Rearview
     end
 
     def schedule
-      debug "#{self} schedule"
+      logger.debug "#{self} schedule"
       @timer = after(@delay) { self.run }
     end
 
     def run
-      debug "#{self} run"
+      logger.debug "#{self} run"
       vm = Rearview::Vm.new
       @statsd.batch do |batch|
         batch.gauge('vm.total_memory',vm.total_memory.bytes_to_kilobytes)
@@ -42,7 +42,7 @@ module Rearview
         batch.gauge('monitor.total',( Rearview.config.monitor_enabled? ? Rearview.monitor_service.jobs.keys.count : 0 ))
       end
     rescue
-      error "#{self} run failed: #{$!}\n#{$@.join("\n")}"
+      logger.error "#{self} run failed: #{$!}\n#{$@.join("\n")}"
     ensure
       schedule
     end

data/lib/rearview/version.rb

@@ -1,3 +1,3 @@
 module Rearview
-  VERSION = "1.0.3.rc.3"
+  VERSION = "1.0.3.rc.4"
 end

data/lib/rearview.rb

@@ -1,9 +1,10 @@
-require "rearview/engine"
-require "rearview/concerns"
-require "rearview/ext/state_machine"
-require "rearview/ext/numeric"
-require "rearview/constants_module_maker"
+require 'rearview/engine'
+require 'rearview/concerns'
+require 'rearview/ext/state_machine'
+require 'rearview/ext/numeric'
+require 'rearview/constants_module_maker'
 require 'rearview/logger'
+require 'rearview/log_formatter'
 require 'rearview/cron_helper'
 require 'rearview/graphite_parser'
 require 'rearview/results_handler'
@@ -52,29 +53,27 @@ module Rearview
   end
 
   def boot!
-    @logger = config.logger if(config.logger.present?)
-    logger.info "[#{self}] booting..."
-    logger.info "[#{self}] using configuration: \n#{config.dump}"
+    Celluloid.logger = @logger = config.logger if(config.logger.present?)
+    logger.info "booting..."
+    logger.info "using configuration: \n#{config.dump}"
     if config.verify?
       unless config.valid?
-        logger.warn "[#{self}] configuration check FAILED: \n#{config.errors.full_messages.join("\n")}"
+        logger.warn "configuration check FAILED: \n#{config.errors.full_messages.join("\n")}"
       end
     end
-    Celluloid.logger = @logger
     jobs = ( config.preload_jobs? ? Job.schedulable : [] )
-    logger.info "[#{self}] starting up monitor service for (#{jobs.count}) job(s)"
+    logger.info "starting up monitor service for (#{jobs.count}) job(s)"
     @monitor_service = Rearview::MonitorService.new(jobs)
     if config.monitor_enabled?
       @monitor_service.startup
     else
-      logger.warn "[#{self}] monitor disabled"
+      logger.warn "monitor disabled!"
     end
     if config.stats_enabled?
-      logger.info "[#{self}] starting up stats service"
+      logger.info "starting up stats service"
       @stats_service = Rearview::StatsService.supervise
       @stats_service.actors.first.startup
     end
-
     @alert_clients = Rearview::Alerts.registry.values
     @booted = true
   end

data/spec/dummy/log/development.log

@@ -311,3 +311,21 @@
    (12.0ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
    (1.0ms)  SELECT version FROM `schema_migrations`
    (4.0ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131106162900')
+   (20.0ms)  DROP DATABASE IF EXISTS `rearview_ruby_test`
+   (2.0ms)  CREATE DATABASE `rearview_ruby_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (39.0ms)  CREATE TABLE `applications` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255) NOT NULL, `created_at` datetime, `updated_at` datetime, `deleted_at` datetime, `ancestry` varchar(255), `description` varchar(255)) ENGINE=InnoDB DEFAULT CHARSET=utf8
+   (11.0ms)  CREATE INDEX `index_applications_on_ancestry` ON `applications` (`ancestry`)
+   (9.0ms)  CREATE INDEX `user_id` ON `applications` (`user_id`)
+   (8.0ms)  CREATE TABLE `job_data` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `job_id` int(11) DEFAULT 0 NOT NULL, `created_at` datetime, `updated_at` datetime, `data` longtext NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8
+   (7.0ms)  CREATE TABLE `job_errors` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `job_id` int(11), `created_at` datetime, `message` longtext, `status` varchar(255), `last_alerted_at` datetime, `updated_at` datetime) ENGINE=InnoDB DEFAULT CHARSET=utf8
+   (9.0ms)  CREATE INDEX `job_id` ON `job_errors` (`job_id`)
+   (16.0ms)  CREATE TABLE `jobs` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `created_at` datetime, `updated_at` datetime, `name` varchar(255) NOT NULL, `active` tinyint(1) DEFAULT 1 NOT NULL, `last_run` datetime, `cron_expr` varchar(1024) NOT NULL, `status` varchar(255), `user_id` int(11), `alert_keys` text, `deleted_at` datetime, `error_timeout` int(11) DEFAULT 60 NOT NULL, `next_run` datetime, `description` text, `app_id` int(11) NOT NULL, `metrics` text NOT NULL, `monitor_expr` text, `minutes` int(11), `to_date` text) ENGINE=InnoDB DEFAULT CHARSET=utf8
+   (10.0ms)  CREATE INDEX `app_id` ON `jobs` (`app_id`)
+   (9.0ms)  CREATE UNIQUE INDEX `id_name_version_key` ON `jobs` (`id`, `name`)
+   (12.0ms)  CREATE INDEX `jobs_ibfk_1` ON `jobs` (`user_id`)
+   (10.0ms)  CREATE TABLE `users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `created_at` datetime, `updated_at` datetime, `encrypted_password` varchar(255) DEFAULT '' NOT NULL, `email` varchar(255) NOT NULL, `first_name` varchar(255), `last_name` varchar(255), `last_login` datetime, `preferences` text) ENGINE=InnoDB DEFAULT CHARSET=utf8
+   (9.0ms)  CREATE UNIQUE INDEX `email` ON `users` (`email`)
+   (14.0ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8
+   (10.0ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (2.0ms)  SELECT version FROM `schema_migrations`
+   (2.0ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131106162900')