simple_cloud_logging 1.1.3 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05cd8b9fc53224e8eff70695f4b8ce927fb083c6
-  data.tar.gz: 05ea1e1f03477f539e67326946c416a1a9dc02c2
+  metadata.gz: c78d8e30e4408513a454acbafb2aa647138bb28a
+  data.tar.gz: a720d8c42078a1493bcd091684d34eaead0a5d8c
 SHA512:
-  metadata.gz: ca765cd96a2ccafecda1674c3d49dcebd433f399717c1a644340a34d457f6a745c4c39e829977f97b8c1ea0d955603a01e3009a40912db3069e8932c54cc73e1
-  data.tar.gz: bf2c36de80a4c6bed32a9a8b77006ea09680567bfdd9e42c53120b76f466299b3e6bedd96fb632d044ee301986f22bca7db8c42174a8a2994239b4d888b8855b
+  metadata.gz: 331e442c7aca0b443b0afedb0f2603b9e329fe6a05c43fdfb4b5d1329a88f32e59ac1fd191b2851ec40cf6dfeb254c6a71a0b9c67980277340efb06d5424a43b
+  data.tar.gz: a2a092535cfa53db7d4796b8181f750fdb15bf5ad85cbf46883f54108a12045883ba1f95b55c6a9ee254cf6836456ac0f33a13ccaedd7bcb19d1d3c5f1b57d53

data/examples/example01.rb

@@ -1,6 +1,8 @@
 require_relative '../lib/simple_cloud_logging'
 
-logger = BlackStack::LocalLogger.new('./example01.log')
+# Testing a simple local log.
+
+logger = BlackStack::LocalLoggerFactory.create('./example01.log')
 
 logger.logs("Declare variable... ")
 @n = 5
@@ -12,3 +14,6 @@ if @n>5
 else
   logger.no
 end
+
+#BlackStack::LocalLoggerFactory.save('./example01.log', logger)
+#BlackStack::LocalLoggerFactory.release('./example01.log')

data/examples/example02.rb

@@ -1,6 +1,8 @@
 require_relative '../lib/simple_cloud_logging'
 
-logger = BlackStack::LocalLogger.new('./example02.log')
+# Testing a local log, with 1-level nesting.
+
+logger = BlackStack::LocalLoggerFactory.create('./example02.log')
 
 logger.logs("Declare array of numbers... ")
 @a = [1,2,3,4,5,6,7,8,9,10] 

data/examples/example03.rb

@@ -1,6 +1,8 @@
 require_relative '../lib/simple_cloud_logging'
 
-logger = BlackStack::LocalLogger.new('./example03.log')
+# Testing a local log, with 2-levels of nesting.
+
+logger = BlackStack::LocalLoggerFactory.create('./example03.log')
 
 logger.logs("Declare array of array of numbers... ")
 @a = [[1,2,3],[4,5,6],[7,8,9,10]] 

data/examples/example04.rb

@@ -1,27 +1,40 @@
 require_relative '../lib/simple_cloud_logging'
 
-logger = BlackStack::RemoteLogger.new(
-  './example04.log',
-  'https://127.0.0.1',
-  443,
-  'E20CBAE0-A4D4-4161-8812-6D9FE67A2E47'
-)
+# Testing the LocalLoggerFactory, getting the logger object before each log action.
+# The log should keep congruent, like it happens in example03.rb
 
+logger = BlackStack::LocalLoggerFactory.create('./example04.log')
 logger.logs("Declare array of array of numbers... ")
 @a = [[1,2,3],[4,5,6],[7,8,9,10]] 
+BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+logger = BlackStack::LocalLoggerFactory.create('./example04.log')
 logger.done
 
+BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+logger = BlackStack::LocalLoggerFactory.create('./example04.log')
 logger.logs("Process array of array elements... ")
 @a.each { |b|
+  BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+  logger = BlackStack::LocalLoggerFactory.create('./example04.log')
   logger.logs("Process array of numbers... ")
   b.each { |n|
-    logger.logs("Check if n>5... ")
+    BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+    logger = BlackStack::LocalLoggerFactory.create('./example04.log')
+    logger.logs("Check if #{n.to_s}>5... ")
     if n>5
+      BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+      logger = BlackStack::LocalLoggerFactory.create('./example04.log')
       logger.yes
     else
+      BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+      logger = BlackStack::LocalLoggerFactory.create('./example04.log')
       logger.no
     end
   }
+  BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+  logger = BlackStack::LocalLoggerFactory.create('./example04.log')
   logger.done
 }
+BlackStack::LocalLoggerFactory.save('./example04.log', logger)
+logger = BlackStack::LocalLoggerFactory.create('./example04.log')
 logger.done

data/lib/baselogger.rb

@@ -1,5 +1,10 @@
 module BlackStack
   class BaseLogger
+    METHOD_LOG = 'log'
+    METHOD_LOGS = 'logs'
+    METHOD_LOGF = 'logf'  
+    METHODS = [METHOD_LOG, METHOD_LOGS, METHOD_LOGF]
+
     attr_accessor :filename, :nest_level, :number_of_lines_in_current_level, :current_nest_level
     
     def initialize(the_filename)
@@ -14,14 +19,65 @@ module BlackStack
     end
     
     def log(s)
-      raise "This is an abstract method."
+      ltime = Time.now.strftime("%Y%m%d%H%M%S").to_s
+      ltext = ltime + ":" + s + "\r\n"
+      print ltext
+      ltext
     end
   
     def logs(s)
-      raise "This is an abstract method."
+      ltext = ""
+      self.nest_level += 1
+      self.number_of_lines_in_current_level = 0
+      
+      if self.current_nest_level != self.nest_level 
+        ltext += "\n"
+      end
+      
+      i=1
+      while (i<self.nest_level)
+        ltext += " > "
+        i+=1
+      end
+    
+      if self.nest_level==1 
+        ltime = Time.now.strftime("%Y%m%d%H%M%S").to_s
+        ltext += ltime + ":" + s
+      else
+        ltext += s
+      end
+                  
+      #File.open(self.filename, 'a') { |file| file.write(ltext) }
+      print ltext
+      
+      #
+      self.current_nest_level = self.nest_level
+
+      #
+      ltext
     end
   
     def logf(s)
+      ltext = ""
+      if self.number_of_lines_in_current_level > 0
+        i=1
+        while (i<self.nest_level)
+          ltext += " > "
+          i+=1
+        end
+      end # if self.number_of_lines_in_current_level == 0
+      
+      self.nest_level -= 1
+      self.number_of_lines_in_current_level += 1
+
+      ltext += s + "\n"
+
+      print ltext
+      
+      ltext
+    end
+
+    def release()
       raise "This is an abstract method."
     end
   

data/lib/locallogger.rb

@@ -2,64 +2,29 @@ module BlackStack
   require_relative './baselogger'
   class LocalLogger < BlackStack::BaseLogger
     def log(s)
-      ltime = Time.now.strftime("%Y%m%d%H%M%S").to_s
-      ltext = ltime + ":" + s + "\r\n"
+      ltext = super(s)
       File.open(self.filename, 'a') { |file| file.write(ltext) }
-      print ltext
+      ltext
     end
   
     # 
     def logs(s)
-      self.nest_level += 1
-      self.number_of_lines_in_current_level = 0
-      
-      if self.current_nest_level != self.nest_level 
-        ltext = "\r\n"
-        print ltext 
-        File.open(self.filename, 'a') { |file| file.write(ltext) }
-      end
-      
-      i=1
-      while (i<self.nest_level)
-        ltext = " > "
-        print ltext 
-        File.open(self.filename, 'a') { |file| file.write(ltext) }
-        i+=1
-      end
-    
-      ltext = s
-      if self.nest_level==1 
-        ltime = Time.now.strftime("%Y%m%d%H%M%S").to_s
-        ltext = ltime + ":" + s
-      end
-                  
-      #File.open(self.filename, 'a') { |file| file.write(ltext) }
-      print ltext
+      ltext = super(s)
       File.open(self.filename, 'a') { |file| file.write(ltext) }
-      
-      #
-      self.current_nest_level = self.nest_level
+      ltext
     end # def logs
   
     # 
     def logf(s)      
-      if self.number_of_lines_in_current_level > 0
-        i=1
-        while (i<self.nest_level)
-          ltext = " > "
-          print ltext 
-          File.open(self.filename, 'a') { |file| file.write(ltext) }
-          i+=1
-        end
-      end # if self.number_of_lines_in_current_level == 0
-      
-      self.nest_level -= 1
-      self.number_of_lines_in_current_level += 1
-
-      ltext = s + "\r\n"
-      print ltext
+      ltext = super(s)
       File.open(self.filename, 'a') { |file| file.write(ltext) }
+      ltext
     end # def logf
-    
+
+    # 
+    def release()
+      BlackStack::LocalLoggerFactory.release(self.filename)
+    end
+
   end # class LocalLogger
 end # module BlackStack

data/lib/remotelogger.rb

@@ -11,40 +11,47 @@ module BlackStack
     end
 
     def log(s)
-      nTries = 0
-      bSuccess = false
-      parsed = nil
-      sError = ""
-      while (nTries < 5 && bSuccess == false)
-        begin
-          nTries = nTries + 1
-          uri = URI("#{self.api_url}:#{self.api_port}/log.json")
-          res = CallPOST(uri,
-            {'uid' => normalizeGuid(uid),}
-          )
-          parsed = JSON.parse(res.body)
-          if (parsed['status']=='success')
-            bSuccess = true
-          else
-            sError = parsed['status']
-          end
-        rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
-        rescue => e2
-          sError = "Exception" + e2.to_s
-        end
-      end # while
-  
-      if (bSuccess==false)
-        raise "#{sError}"
-      end
+      ltext = super(s)
+      url = "#{self.api_url}:#{self.api_port}/api1.4/scl/log.json"
+      res = BlackStack::Netting::api_call(url, {
+        'api_key' => self.api_key,
+        'filename' => self.filename,
+        'text' => s,
+        'method' => BlackStack::BaseLogger::METHOD_LOG, 
+      })
+      ltext
     end
 
     def logs(s)
+      ltext = super(s)
+      url = "#{self.api_url}:#{self.api_port}/api1.4/scl/log.json"
+      res = BlackStack::Netting::api_call(url, {
+        'api_key' => self.api_key,
+        'filename' => self.filename,
+        'text' => s,
+        'method' => BlackStack::BaseLogger::METHOD_LOGS, 
+      })
+      ltext
     end
 
     def logf(s)
+      ltext = super(s)
+      url = "#{self.api_url}:#{self.api_port}/api1.4/scl/log.json"
+      res = BlackStack::Netting::api_call(url, {
+        'api_key' => self.api_key,
+        'filename' => self.filename,
+        'text' => s,
+        'method' => BlackStack::BaseLogger::METHOD_LOGF, 
+      })
+      ltext
+    end    
+
+    def release()
+      url = "#{self.api_url}:#{self.api_port}/api1.4/scl/release.json"
+      res = BlackStack::Netting::api_call(url, {
+        'api_key' => self.api_key,
+        'filename' => self.filename, 
+      })
     end
-    
   end
 end # module BlackStack

data/lib/simple_cloud_logging.rb

@@ -1,3 +1,50 @@
 require 'blackstack_commons'
 require_relative './locallogger'
-require_relative './remotelogger'
+require_relative './remotelogger'
+
+module BlackStack
+
+
+
+  class LocalLoggerFactory  
+  def self.lock()
+    @@fd.flock(File::LOCK_EX)
+  end
+
+  def self.release()
+    @@fd.flock(File::LOCK_UN)
+  end
+
+    # 
+    def self.create(filename)
+      data_filename = "#{filename}.data" 
+      ret = BlackStack::LocalLogger.new(filename)
+      if File.exist?(data_filename)
+        f = File.open(data_filename,"r")
+        data = f.read.split(/,/)
+        ret.nest_level = data[0].to_i
+        ret.number_of_lines_in_current_level = data[1].to_i 
+        ret.current_nest_level = data[2].to_i
+        f.close
+      end
+      ret
+    end
+
+    # 
+    def self.save(filename, locallogger)
+      data_filename = "#{filename}.data" 
+      ret = BlackStack::LocalLogger.new(filename)
+      f = File.open(data_filename,"w")
+      f.write "#{locallogger.nest_level.to_s},#{locallogger.number_of_lines_in_current_level.to_s},#{locallogger.current_nest_level.to_s}"
+      f.close
+    end
+
+    # 
+    def self.release(filename)
+      data_filename = "#{filename}.data"
+      File.delete(data_filename) if File.exist?(data_filename) 
+    end
+    
+  end # class LocalLoggerFactory
+    
+end # module BlackStack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cloud_logging
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.9
 platform: ruby
 authors:
 - Leandro Daniel Sardi