dynarex_cron 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d94bcaf6e26c355a32180f1e68a27b5e73ecff6
-  data.tar.gz: a99e0a754a774080e80b4c4d2a2255d2ab8984ad
+  metadata.gz: cdc7ce3471d1815443b06f59c463e6fd4044e627
+  data.tar.gz: fd9f687da9c0b2386ed8d1dd3f7be591af338d13
 SHA512:
-  metadata.gz: da312335793f100c883a7fac0bb024a057b7f75b242acbd96e6014d51c3e3c371e797472a0de93724fcac4f2d22bd008f8d3abfdb542cb2cae0eb048df9e1a6e
-  data.tar.gz: bfe43b8ba27d6db1c939c8d7b929a3844e15e71a711d36ffd1e528e495c705e4779cec229e67d9936eb948d7018bdf3dac2f48401fa8a138f917a4f7faf76e54
+  metadata.gz: e131466356dca6d8bd81058d17ea6079dec47279bbf339dea293ce8d45a73e1f79a53d32e93899439c08d36e684c34a93ddbc87a33e5d24200768e7ab4473c74
+  data.tar.gz: 1ae2fe7add97b0033e9dfd156d2f0c2fa7ca33facac60dff39f693fe153c46b7da031029c5422a05e8b6957c7c3c93c6077c2651f4a6d8abbdfa7af936993919

data/lib/dynarex_cron.rb

@@ -28,7 +28,7 @@ class DynarexCron
 
     if @dxfile then
 
-      dynarex = load_doc dxfile
+      dynarex,_ = load_doc dxfile
       load_entries(dynarex)
     end 
 
@@ -58,10 +58,13 @@ class DynarexCron
         # What happens if the @dxfile is a URL and the web server is 
         # temporarily unavailable? i.e. 503 Service Temporarily Unavailable
         begin
-          buffer, _ = RXFHelper.read(@dxfile)
-          reload_entries buffer if @buffer != buffer          
+
+          dx, buffer = load_doc(@dxfile)
+          load_entries dx if @buffer != buffer          
+          @buffer = buffer
+          
         rescue
-          puts 'dynarex_cron: warning: ' + ($!).inspect           
+          @log.debug 'DynarexCron/start: warning: ' + ($!).inspect
         end        
 
       end
@@ -84,20 +87,24 @@ class DynarexCron
     if dynarex_file.is_a?(Dynarex) then
       dynarex_file
     else
-      @buffer, _ = RXFHelper.read(dynarex_file)
-      Dynarex.new @buffer
+      
+      buffer, _ = RXFHelper.read(dynarex_file)      
+      dx = buffer =~ /<?dynarex/ ? Dynarex.new.import(buffer) : \
+          Dynarex.new(buffer)
+      
+      [dx, buffer]
     end
         
   end
 
-  def load_entries(dynarex)
+  def load_entries(dx)
     
-    if dynarex.summary[:sps_address] then
-      @sps_address, @sps_port = dynarex.summary[:sps_address]\
+    if dx.summary[:sps_address] then
+      @sps_address, @sps_port = dx.summary[:sps_address]\
                                                     .split(':',2) << '59000'
     end
     
-    @cron_entries = dynarex.to_h
+    @cron_entries = dx.to_h
     @cron_entries.each do |h| 
       h[:cron] = ChronicCron.new(h[:expression], Time.now + @time_offset)
     end
@@ -109,8 +116,12 @@ class DynarexCron
     cron_entries.each do |h|
       
       datetime = (Time.now + @time_offset).strftime(DF)
-      @log.info 'DynarexCron/iterate: datetime: ' + datetime if @log
-      @log.info 'DynarexCron/iterate: cron.to_time: ' + h[:cron].to_time.strftime(DF) if @log
+      
+      if @log then
+        @log.info 'DynarexCron/iterate: datetime: ' + datetime
+        @log.info 'DynarexCron/iterate: cron.to_time: ' \
+            + h[:cron].to_time.strftime(DF)
+      end
       
       if h[:cron].to_time.strftime(DF) == datetime then
 
@@ -141,10 +152,4 @@ class DynarexCron
     end
   end
 
-  def reload_entries(buffer)    
-
-    load_entries Dynarex.new(buffer)
-    @buffer = buffer
-  end   
-  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex_cron
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   tsPyW5OuDQXshrgmPt97DD8Btg4Tg5CGwnm0aeVYC/E4PnCMrtQNyPaRwBfvGrF0
   vXqXm6nxDCrL/w==
   -----END CERTIFICATE-----
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron