freyr 0.3.8 → 0.3.9

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/lib/freyr/cli/monitor.rb

@@ -22,10 +22,9 @@ module Freyr
     method_option :'no-follow', :type => :boolean, :default => false, :desc => 'Disable auto follow, just print tail and exit'
     def tail(name=nil)
       services = get_from_name(name)
-      Freyr.logger.debug('tail args') {"Lines: #{options.lines}, following: #{!options['no-follow']}"}
-      Freyr.logger.debug('tailing service') {services.first.inspect}
       if !services.empty?
-        
+        Freyr.logger.debug('tail args') {"Lines: #{options.lines}, following: #{!options['no-follow']}"}
+        Freyr.logger.debug('tailing service') {services.first.inspect}
         services.first.tail!(options.lines, !options['no-follow'])
       else
         say "Can't find the #{name} service", :red

data/lib/freyr/service.rb

@@ -31,8 +31,11 @@ module Freyr
     end
     
     def start!
-      return unless start_command
-      command.run! unless alive?
+      if start_command
+        command.run! unless alive?
+      else
+        error("no start_command")
+      end
     end
     
     def stop!
@@ -59,15 +62,26 @@ module Freyr
       end
     end
     
+    def read_log
+      @service_info.log || @service_info.read_log
+    end
+    
     def tail!(size = 600, follow = true)
       f = follow ? 'f' : ''
-      if log
-        cmd = "tail -#{size}#{f} #{File.join(dir||'/',log)}"
+      if read_log
+        cmd = "tail -#{size}#{f} #{File.join(dir||'/',read_log)}"
         Freyr.logger.debug("tailing cmd") {cmd.inspect}
-        exec("tail -#{size}#{f} #{log}")
+        exec(cmd)
+      else
+        error("no logfile found")
       end
     end
     
+    def error *args, &blk
+      Freyr.logger.error(*args,&blk)
+      Freyr.logger.debug("service info for service #{self}") {@service_info.inspect}
+    end
+    
     def describe
       %Q{#{name}(#{groups.join(',')}) - #{start_command}}
     end
@@ -79,6 +93,10 @@ module Freyr
       also.find {|a| a.to_s == n}
     end
     
+    def inspect
+      %Q{#<Freyr::Service #{name} #{start_command.inspect}>}
+    end
+    
     class << self
       
       def s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Tal Atlas