eye 0.8.celluloid15 → 0.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b53d19c30acc0229dfdec07e5c135d8cc997fc
-  data.tar.gz: 82f8d45c31474a83b479376922899f39cfe9e232
+  metadata.gz: 4ea3a96041c3e00aa9a2844e50fa3b5c0be453c6
+  data.tar.gz: 8c81af5c7d106a079cfc49023b16472bf78600ad
 SHA512:
-  metadata.gz: 30546ea03294ca6ad90a9f6cc6ed82aeacd386163759a08f6ab51051234835eef9591a73b934eb91f0701574e57b016ff7ca8437990a00f826bc7b5bdad3edde
-  data.tar.gz: 23e7c50c282eefa9a41420d07704007dc18fc1f1ddfa804f56a659263115db76031be59686dac00499da1eda51db03891b9fa34cc7f6e624f87cb01ce69fd782
+  metadata.gz: dc19f2831994ee9bba061abb1d374d928f8687d1fd39b78e18281d9a8c688a02aec672bf949a5e40fbc024507fb2dfc274374c917fe89f76afd9398e7bfd1411
+  data.tar.gz: 71b61401efa1a893d781e561c73554ba165b3984de5bc9b359adcaf51cf0e6d18bfb7aade77816dae326a29142b15be57c0e1ba34f1b78776025908b9bd7a5e4

data/.travis.yml

@@ -2,8 +2,6 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-  - "2.1.7"
-  - "2.2.3"
-script:
-  - bundle exec rake N=16
-  - bundle exec rubocop
+  - "2.1"
+  - "2.2.2"
+script: bundle exec rake split_test N=15

data/CHANGES.md

@@ -1,10 +1,6 @@
-0.8
+0.8.pre
 -------
-* info, xinfo, oinfo, history now support -j flag, to output json
-* leye: many fixes (--eyehome, --eyefile)
-* add flapping reretry_in (#152)
-* add check_identity of processes, avoid many bugs with wrong pid_files, or auto changed pids (#62)
-* update Celluloid to 0.17
+* Update Celluloid to 0.17.0
 
 0.7
 -------
@@ -21,7 +17,7 @@
 * some fixes in flapping
 * add proxy_url to http check
 * process with children, shows children history now
-* update Celluloid to 0.16
+* Update Celluloid to 0.16.0
 
 0.6.4
 -----

data/README.md

@@ -98,7 +98,7 @@ Eye.application 'test' do
   end
 
   # eventmachine process, daemonized with eye
-  process :event_machine do
+  process :event_machine do |p|
     pid_file 'em.pid'
     start_command 'ruby em.rb'
     stdout 'em.log'
@@ -118,6 +118,7 @@ Eye.application 'test' do
     check :http, url: 'http://127.0.0.1:33233/hello', pattern: /World/,
                  every: 5.seconds, times: [2, 3], timeout: 1.second
   end
+
 end
 ```
 
@@ -136,10 +137,6 @@ foreground load:
 
 If the eye daemon has already started and you call the `load` command, the config will be updated (into eye daemon). New objects(applications, groups, processes) will be added and monitored. Processes removed from the config will be removed (and stopped if the process has `stop_on_delete true`). Other objects will update their configs.
 
-Two global configs loaded by default, if it exists (with the first eye load):
-
-    /etc/eye.conf
-    ~/.eyeconfig
 
 Process statuses:
 

data/Rakefile

@@ -1,21 +1,21 @@
 #!/usr/bin/env rake
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
 
-task :default => :split_test
+task :default => :pspec
 
-desc 'run parallel tests'
+desc "run parallel tests"
 task :pspec do
   dirname = File.expand_path(File.dirname(__FILE__))
   cmd = "bundle exec parallel_rspec -n #{ENV['N'] || 10} --runtime-log '#{dirname}/spec/weights.txt' #{dirname}/spec"
   abort unless system(cmd)
 end
 
-desc 'run parallel split tests'
+desc "run parallel split tests"
 task :split_test do
   dirname = File.expand_path(File.dirname(__FILE__))
   ENV['PARALLEL_SPLIT_TEST_PROCESSES'] = (ENV['N'] || 10).to_s
@@ -39,7 +39,7 @@ task :env do
   Eye::Process
 end
 
-desc 'graph'
+desc "graph"
 task :graph => :env do
-  StateMachine::Machine.draw('Eye::Process')
+  StateMachine::Machine.draw("Eye::Process")
 end

data/bin/leye

@@ -6,7 +6,7 @@ require 'eye'
 #  which looking for Eyefile
 #  like foreman
 
-loop do
+while true
   if ARGV[0] == '--eyefile'
     ARGV.shift
     ENV['EYE_FILE'] = File.expand_path(ARGV.shift.to_s)
@@ -18,18 +18,13 @@ loop do
   end
 end
 
-if ENV['EYE_HOME'] && !File.directory?(File.expand_path(ENV['EYE_HOME']))
-  puts "\033[31mEYE_HOME is not directory (#{File.expand_path(ENV['EYE_HOME'])})\033[0m"
-  exit 1
-end
-
-unless Eye::Local.eyefile || ENV['EYE_HOME']
-  puts "\033[31mNot found Eyefile (in #{File.expand_path(ENV['EYE_HOME'] || '.')})\033[0m"
+unless Eye::Local.eyefile
+  puts "\033[31mNot found Eyefile (in #{File.expand_path('.')})\033[0m"
   exit 1
 end
 
 unless ENV.key?('EYE_HOME')
-  ENV['EYE_HOME'] = File.dirname(Eye::Local.eyefile)
+  Eye::Local.dir = File.join(File.dirname(Eye::Local.eyefile), '.eye')
 end
 
 Eye::Local.local_runner = true

data/bin/loader_eye

@@ -4,38 +4,39 @@ require 'eye/loader'
 require 'optparse'
 require 'eye'
 
-options = { debug: false }
+options = {:debug => false}
 
 OptionParser.new do |opts|
-  opts.on('-h', '--help', 'Display this screen') do
+  opts.on( '-h', '--help', 'Display this screen' ) do
     puts opts
     exit
   end
 
-  opts.on('-c', '--config CONFIG', 'load with config') do |config_path|
+  opts.on( '-c', '--config CONFIG', 'load with config' ) do |config_path|
     options[:config] = config_path
   end
 
-  opts.on('-s', '--socket SOCKET', 'start listen on socket') do |socket_path|
+  opts.on( '-s', '--socket SOCKET', 'start listen on socket' ) do |socket_path|
     options[:socket_path] = socket_path
   end
 
-  opts.on('-l', '--logger LOGGER', 'custom logger') do |logger|
+  opts.on( '-l', '--logger LOGGER', 'custom logger' ) do |logger|
     options[:logger] = logger
   end
 
-  opts.on('-d', '--dir DIR', 'Dir for local runner') do |dir|
+  opts.on( '-dr', '--dir DIR', 'Dir for local runner' ) do |dir|
     Eye::Local.dir = dir
     Eye::Local.local_runner = true
   end
 
-  opts.on('-a', '--stop_all', 'Stop all on exit') do
+  opts.on( '-st', '--stop_all', 'Stop all on exit' ) do |stop_all|
     options[:stop_all] = true
   end
 
-  opts.on('-g', '--debug', 'debug info to logger') do
+  opts.on( '-d', '--debug', 'debug info to logger' ) do
     options[:debug] = true
   end
+
 end.parse!
 
 Eye::Local.ensure_eye_dir
@@ -60,12 +61,12 @@ Eye::Control.set_proc_line
 
 server.async.run
 
-trap('USR1') { Eye::Logger.reopen }
-trap('USR2') { GC.start }
+trap("USR1") { Eye::Logger.reopen }
+trap("USR2") { GC.start }
+trap("INT")  { Eye::Logger.info("INT signal <#{$$}>"); exit }
+trap("QUIT") { Eye::Logger.info("QUIT signal <#{$$}>"); exit }
+trap("TERM") { Eye::Logger.info("TERM signal <#{$$}>"); exit }
 
 at_exit { Eye::Control.command(:stop_all) } if options[:stop_all]
 
-begin
-  sleep
-rescue Interrupt
-end
+sleep

data/examples/delayed_job.eye

@@ -1,6 +1,6 @@
 cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[ ../ ../ ]))
 
-config_path = File.join(cwd, %w[ config dj.yml ])
+config_path = File.join(cwd, %w{ config dj.yml } )
 
 workers_count = if File.exist?(config_path)
   YAML.load_file(config_path).try(:[], :workers) || 5
@@ -15,10 +15,10 @@ Eye.application 'delayed_job' do
   group 'dj' do
     chain grace: 5.seconds
 
-    (1..workers_count).each do |i|
+    (1 .. workers_count).each do |i|
       process "dj-#{i}" do
         pid_file "tmp/pids/delayed_job.#{i}.pid"
-        start_command 'rake jobs:work'
+        start_command "rake jobs:work"
         daemonize true
         stop_signals [:INT, 30.seconds, :TERM, 10.seconds, :KILL]
         stdall "log/dj-#{i}.log"

data/examples/dependency.eye

@@ -2,36 +2,37 @@
 
 Eye.app :dependency do
   process(:a) do
-    start_command 'sleep 100'
+    start_command "sleep 100"
     daemonize true
-    pid_file '/tmp/test_process_a.pid'
+    pid_file "/tmp/test_process_a.pid"
   end
 
   process(:b) do
-    start_command 'sleep 100'
+    start_command "sleep 100"
     daemonize true
-    pid_file '/tmp/test_process_b.pid'
+    pid_file "/tmp/test_process_b.pid"
     depend_on :a
   end
 
   process(:c) do
-    start_command 'sleep 100'
+    start_command "sleep 100"
     daemonize true
-    pid_file '/tmp/test_process_c.pid'
+    pid_file "/tmp/test_process_c.pid"
     depend_on :a
   end
 
   process(:d) do
-    start_command 'sleep 100'
+    start_command "sleep 100"
     daemonize true
-    pid_file '/tmp/test_process_d.pid'
+    pid_file "/tmp/test_process_d.pid"
     depend_on :b
   end
 
   process(:e) do
-    start_command 'sleep 100'
+    start_command "sleep 100"
     daemonize true
-    pid_file '/tmp/test_process_e.pid'
+    pid_file "/tmp/test_process_e.pid"
     depend_on [:d, :c]
   end
+
 end

data/examples/notify.eye

@@ -1,7 +1,7 @@
 # Notify example
 
 Eye.config do
-  mail host: 'mx.some.host', port: 25, domain: 'some.host'
+  mail :host => "mx.some.host", :port => 25, :domain => "some.host"
   contact :errors, :mail, 'error@some.host'
   contact :dev, :mail, 'dev@some.host'
 end
@@ -11,8 +11,9 @@ Eye.application :some do
 
   process :some_process do
     notify :dev, :info
-    pid_file '1.pid'
+    pid_file "1.pid"
 
-    # ...
+    #...
   end
+
 end

data/examples/plugin/main.eye

@@ -1,15 +1,15 @@
 Eye.load('./plugin.rb')
 
 Eye.config do
-  logger '/tmp/eye.log'
-  enable_reactor(1.second, '/tmp/cmd.txt')
-  enable_saver('/tmp/saver.log')
+  logger "/tmp/eye.log"
+  enable_reactor(1.second, "/tmp/cmd.txt")
+  enable_saver("/tmp/saver.log")
 end
 
 Eye.app :app do
   process :process do
-    pid_file '/tmp/p.pid'
-    start_command 'sleep 10'
+    pid_file "/tmp/p.pid"
+    start_command "sleep 10"
     daemonize true
   end
 end

data/examples/plugin/plugin.rb

@@ -1,5 +1,4 @@
 class Reactor
-
   include Celluloid
 
   def initialize(interval, filename)
@@ -22,13 +21,11 @@ class Reactor
   end
 
   def execute_command(cmd)
-    Eye::Control.command(cmd, 'all') if %w[restart start stop].include?(cmd)
+    Eye::Control.command(cmd, 'all') if %w{restart start stop}.include?(cmd)
   end
-
 end
 
 class Saver < Eye::Trigger::Custom
-
   param :log_name, String, true
 
   def check(trans)
@@ -38,7 +35,6 @@ class Saver < Eye::Trigger::Custom
   def tlogger
     @tlogger ||= Logger.new(log_name)
   end
-
 end
 
 def reactor
@@ -47,25 +43,21 @@ end
 
 # Extend config options, add enable_reactor
 class Eye::Dsl::ConfigOpts
-
   def enable_reactor(*args)
     @config[:reactor] = args
   end
 
   def enable_saver(save_log)
     Eye.application '__default__' do
-      trigger :saver, log_name: save_log
+      trigger :saver, :log_name => save_log
     end
   end
-
 end
 
 # extend controller to execute method, and config loads
 class Eye::Controller
-
   def set_opt_reactor(args)
     reactor.terminate if reactor
     Celluloid::Actor[:reactor] = Reactor.supervise(*args)
   end
-
 end

data/examples/process_thin.rb

@@ -4,16 +4,16 @@ def thin(proxy, port)
   name = "thin-#{port}"
 
   opts = [
-    '-l thins.log',
+    "-l thins.log",
     "-p #{port}",
     "-P #{name}.pid",
-    '-d',
-    '-R thin.ru',
+    "-d",
+    "-R thin.ru",
     "--tag #{proxy.app.name}.#{proxy.name}",
-    '-t 60',
+    "-t 60",
     "-e #{proxy.env['RAILS_ENV']}",
     "-c #{proxy.working_dir}",
-    '-a 127.0.0.1'
+    "-a 127.0.0.1"
   ]
 
   proxy.process(name) do
@@ -22,9 +22,9 @@ def thin(proxy, port)
     start_command "#{BUNDLE} exec thin start #{opts * ' '}"
     stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
 
-    stdall 'thin.stdall.log'
+    stdall "thin.stdall.log"
 
-    check :http, url: "http://127.0.0.1:#{port}/hello", pattern: /World/,
-                 every: 5.seconds, times: [2, 3], timeout: 1.second
+    check :http, :url => "http://127.0.0.1:#{port}/hello", :pattern => /World/,
+                 :every => 5.seconds, :times => [2, 3], :timeout => 1.second
   end
 end

data/examples/processes/em.rb

@@ -5,9 +5,7 @@ def answer(data)
   case data
     when 'ping' then "pong\n"
     when 'bad' then "what\n"
-    when 'timeout' then
-      sleep 5
-      "ok\n"
+    when 'timeout' then sleep 5; "ok\n"
     when 'exception' then raise 'haha'
     when 'quit' then EM.stop
     when 'big' then 'a' * 10_000_000
@@ -15,49 +13,45 @@ def answer(data)
 end
 
 class Echo < EM::Connection
-
   def post_init
-    puts '-- someone connected to the echo server!'
+    puts "-- someone connected to the echo server!"
   end
 
-  def receive_data(data)
+  def receive_data data
     puts "receive #{data.inspect} "
     send_data(answer(data))
   end
 
   def unbind
-    puts '-- someone disconnected from the echo server!'
+     puts "-- someone disconnected from the echo server!"
   end
-
 end
 
 class EchoObj < EM::Connection
-
   include EM::P::ObjectProtocol
 
   def post_init
-    puts '-- someone connected to the echo server!'
+    puts "-- someone connected to the echo server!"
   end
 
-  def receive_object(obj) # {:command => 'ping'}
+  def receive_object obj # {:command => 'ping'}
     puts "receive #{obj.inspect}"
     send_object(answer(obj[:command]).chop)
   end
 
   def unbind
-    puts '-- someone disconnected from the echo server!'
+    puts "-- someone disconnected from the echo server!"
   end
-
 end
 
-trap 'QUIT' do
-  puts 'quit signal, stopping'
+trap "QUIT" do
+  puts "quit signal, stopping"
   EM.stop
 end
 
 EM.run do
-  EM.start_server '127.0.0.1', 33_221, Echo
-  EM.start_server '127.0.0.1', 33_222, EchoObj
-  EM.start_server '/tmp/em_test_sock', nil, Echo
+  EM.start_server '127.0.0.1', 33221, Echo
+  EM.start_server '127.0.0.1', 33222, EchoObj
+  EM.start_server "/tmp/em_test_sock", nil, Echo
   puts 'started'
 end