kryten 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0a14d2f5b04660d77a405f0a85afeb514ad736
-  data.tar.gz: 60fb6fc7ba1502f6f627db72343f5d14c1b95388
+  metadata.gz: ff4e205748887527fb006bd3cb5f73d98e04162d
+  data.tar.gz: fc8a1aae785bdb21683a44eb2f052bed64830a50
 SHA512:
-  metadata.gz: 4403068bc362166a7d7a89137eb2f054cc3ba7f059479122f71206b3025bbef2181831a7f263dc3d0b8750d699a1e0ee6de2b7146825fac11f21ef8aaa042231
-  data.tar.gz: f6590c7e15bcba8888603ebf8bd022e9c835c762feabd6eea7a5f92cbf46a24b61c30b32bd4a4df236aa30e477674d192d470ba9a133c2a7bd54042807ef49f1
+  metadata.gz: d1aa9e498e5ba57173d8bdc7a714dd852dc9be4870d5de76a760d7526aa87b498936d5df685d5a8c987798e904e3f2faa04e954a015ace9aaff50718ee9de147
+  data.tar.gz: 29647916012297f41847df8f09e35583236d1baf30b116bd2340ab1b1832501f32e8bc4bddcd0f1a19cfd4fddfc7cc06608ad3331756212f065739b5d3d1d513

data/bin/console

@@ -6,12 +6,78 @@ require "pry"
 
 include Kryten
 
+class WorkList
+  include BackgroundTask
+end
+
 class Work
+  include BackgroundTask
+  def run
+    work = rand(5)+1;
+    log "working for #{work}"
+    sleep work
+    log "done working"
+  end
+  def timer
+    0.1
+  end
+end
+
+class ThreadedWork
   include ThreadedTask
+  def run
+    work = rand(5)+1;
+    log "working for #{work}"
+    sleep work
+    log "done working"
+  end
+  def timer
+    0.1
+  end
+end
+
+
+work = WorkList.new('visor').workers do
+  [ Work.new('work1'),
+    Work.new('work2'),
+    Work.new('work3').workers do
+    [ Work.new('work3sub1'),
+      Work.new('work3sub2') ]
+    end ]
 end
 
-w1 = Work.new('work1')
-w2 = Work.new('work2')
-w3 = Work.new('work3')
+threaded_work = ThreadVisor.workers do
+  [ ThreadedWork.new('thread work1'),
+    ThreadedWork.new('thread work2'),
+    ThreadedWork.new('thread work3').workers do
+    [ ThreadedWork.new('thread work3sub1'),
+      ThreadedWork.new('thread work3sub2') ]
+    end ]
+end
+
+mixed_work = Work.new('mixy').mixed.workers do
+  [ Work.new('mixy 1 process').workers do
+      Work.new('mixy 1 subprocess')
+    end,
+    ThreadedWork.new('mixy 2 thread').workers do
+      ThreadedWork.new('mixy2 subthread')
+    end ]
+end
+
+class CrashWork
+  include BackgroundTask
+  def run
+    sleep rand(3) + 2
+    log 'working'
+    raise 'boom' if rand(5) == 0
+  end
+end
+
+crashing_work = CrashWork.new('crashy').workers do
+  [ Work.new('regular1'),
+    Work.new('regular2'),
+    CrashWork.new('crash3') ]
+end
 
 binding.pry
+#w3.start

data/bin/kryten

@@ -6,19 +6,27 @@ require "pry"
 
 include Kryten
 
-class Work
-  include ThreadedTask
+class WorkList
+  include BackgroundTask
 end
 
-workers = []
-workers << Work.new('work1')
-workers << Work.new('work2')
-w3 = Work.new('work3').workers do
-  [Work.new('work3sub1'),
-   Work.new('work3sub2')]
+class Work
+  include BackgroundTask
+  def run
+    work = rand(5)+1;
+    log "working for #{work}"
+    sleep work
+    log "done working"
+  end
 end
-workers << w3
 
-Supervisor.start(workers)
+work = WorkList.new('visor').workers do
+  [ Work.new('work1'),
+    Work.new('work2'),
+    Work.new('work3').workers do
+    [ Work.new('work3sub1'),
+      Work.new('work3sub2') ]
+    end ]
+end
 
-sleep 10
+work.start

data/lib/kryten/daemon.rb

@@ -0,0 +1,72 @@
+require 'daemons'
+
+module Kryten::Daemon
+  attr_reader :worker
+  attr_accessor :workers
+
+  def setup
+    super
+    if workers
+      log 'starting workers'
+      workers.each(&:start_work)
+    end
+  end
+
+  def start_work
+    if worker && worker.running?
+      log 'worker already running'
+      return false
+    end
+
+    options = {
+      dir_mode: :script,
+      dir: '/tmp/',
+      log_output: false,
+      backtrace: false,
+      multiple: false,
+      ARGV: ['start']
+    }
+    @worker.start_all if @worker
+    @worker ||= Daemons.run_proc(name, options) { start }
+  end
+
+  def log_path
+    "/tmp/#{name}.log"
+  end
+
+  def mixed
+    @mixed = true
+    self
+  end
+
+  def shutdown
+    if @mixed && workers
+      workers.each(&:stop_running)
+    elsif workers
+      workers.each { |w| fork { w.shutdown }}
+      Process.waitall
+    end
+    worker.stop_all if worker
+  end
+
+  def stop_work
+    stop_running
+  end
+
+  def workers
+    if block_given?
+      @workers = Array(yield)
+      return self
+    end
+    @workers
+  end
+
+  def status
+    worker && worker.show_status || 'off'
+  end
+
+  def running
+    worker && worker.running? || false
+  end
+
+end

data/lib/kryten/lawger.rb

@@ -7,13 +7,18 @@ module Kryten::Lawger
     "log/#{name}.log"
   end
 
-  def log message
+  def log(level = :debug, message)
     default_log_format
-    logger.debug(name) { message }
+    logger.progname = name
+    logger.send(level, message )
   end
 
   def logger
-    @logger ||= Logger.new(log_path)
+    unless @logger
+      @logger = Logger.new(log_path)
+      default_log_format
+    end
+    @logger
   end
 
   def default_log_format

data/lib/kryten/runner.rb

@@ -4,12 +4,17 @@ module Kryten::Runner
 
   def initialize title=nil
     @name, @running, @started = title, false, false
+  end
+
+  def setup
+    log "setting up"
     Signal.trap("INT", proc { stop_running })
+    Signal.trap("TERM", proc { stop_running })
   end
 
   def start
     setup
-    log "starting"
+    log "started"
     @started = true
 
     while started do
@@ -22,24 +27,18 @@ module Kryten::Runner
     log "stopped"
     true
   rescue => e
-    log "error #{e}"
-    #raise
-  end
-
-  def run
-    log "running"
+    log :error, "error: #{e} - from: #{e.backtrace.first}"
+    raise
   end
 
   def timer
     @timer || 4
   end
 
+  # stop the loop
   def stop_running
     @started = false
-  end
-
-  def setup
-    log "setting up"
+    shutdown
   end
 
   def debug
@@ -65,4 +64,9 @@ module Kryten::Runner
     started
   end
 
+  # hook methods
+  def shutdown; nil; end
+
+  def run; nil; end
+
 end

data/lib/kryten/summoner.rb

@@ -1,4 +1,4 @@
-# WARNING: Legacy Code
+# legacy
 
 require 'daemons'
 

data/lib/kryten/version.rb

@@ -1,3 +1,3 @@
 module Kryten
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/kryten/weaver.rb

@@ -2,18 +2,28 @@ module Kryten::Weaver
   attr_reader :worker
   attr_accessor :workers
 
-  def start_work
-    workers.each(&:start_work) if workers
+  def setup
+    if workers
+      log 'starting workers'
+      workers.each(&:start_work)
+    end
+  end
 
+  def start_work
     if worker && worker.alive?
       log 'worker already running'
       return false
     end
+
+    @started = true
     @worker = Thread.new { start }
   end
 
+  def shutdown
+    workers.each(&:stop_running) if workers
+  end
+
   def stop_work
-    workers.each(&:stop_work) if workers
     stop_running
   end
 
@@ -25,32 +35,8 @@ module Kryten::Weaver
     @workers
   end
 
-end
-
-class Kryten::Supervisor
-  def self.start(workers)
-    start_workers(workers)
-    sleep 1 while @started
-  end
-
-  def self.start_workers(workers)
-    @workers = workers
-    @started = true
-    Signal.trap("INT", proc { self.stop })
-    workers.each(&:start_work)
-  end
-
-  def self.stop
-    if @started
-      @workers.each(&:stop_work)
-      sleep 1 while @workers.detect(&:running)
-      @started = false
-    end
-  end
-
-  def self.running?
-    @workers.detect(&:running)
+  def log_path
+    "/tmp/#{name}.log"
   end
 
 end
-

data/lib/kryten.rb

@@ -1,10 +1,12 @@
 require "kryten/version"
-require "kryten/summoner"
-require "kryten/weaver"
-require "kryten/lawger"
+require "kryten/environment"
+
 require "kryten/runner"
+require "kryten/lawger"
 require "kryten/helper"
-require "kryten/environment"
+
+require "kryten/weaver"
+require "kryten/daemon"
 
 module Kryten::Task
   include Kryten::Runner
@@ -12,12 +14,21 @@ module Kryten::Task
   include Kryten::Helper
 end
 
-module Kryten::DaemonTask
+module Kryten::ThreadedTask
   include Kryten::Task
-  include Kryten::Summoner
+  include Kryten::Weaver
 end
 
-module Kryten::ThreadedTask
+class Kryten::ThreadVisor
+  extend Kryten::ThreadedTask
+  def self.setup
+    Signal.trap("INT", proc { stop_work })
+    Signal.trap("TERM", proc { stop_work })
+    super
+  end
+end
+
+module Kryten::BackgroundTask
   include Kryten::Task
-  include Kryten::Weaver
+  include Kryten::Daemon
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kryten
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Zsolt Fekete
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,7 @@ files:
 - bin/setup
 - kryten.gemspec
 - lib/kryten.rb
+- lib/kryten/daemon.rb
 - lib/kryten/environment.rb
 - lib/kryten/helper.rb
 - lib/kryten/lawger.rb