drb_fileserver_plus 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9547063824d71ebd77c11e75ee30b9f65834d18b5db3d91ce9580526d7cd69d
-  data.tar.gz: 6dadec10fbbba36cb1beb6249eca1df4762b677f0d9ba83b83de9bf3d40d46be
+  metadata.gz: d527d94fb71c9732110bfe785a6efc2e2e5eb2fe7b2904cd92ea349c8015d022
+  data.tar.gz: 78d01af07689868674507859d7d158dd1db37e92c45ca4666d85ef3df4570944
 SHA512:
-  metadata.gz: d44933c4280f74e469f29d33449e7f5c37d05c2f53cb8887630c6aa593af5e7dbdd82faf5319d0719e498d3da1832b6e4ebd503030bfa790d28a3cf3194a0ad1
-  data.tar.gz: 0360aa78c5b539fac87e93754bcac61b4767791551f2f26415dbac282b9dab4e7325370d3094d0c4e1d57bdd6654e27c7f7197281f7ae034fcda9487a21b3659
+  metadata.gz: fc1fcb04de4f3c1bafdb5e0e89fa7118fe0c002995348f7b3b412d3873499624ff5b26dcf5b0a6103e109c7eeb74474a8897a368f5328c95927cf0c46877d607
+  data.tar.gz: 308c514a2e598cd0fba771cf8b38992f33b87b2efb4d332ca4872af206c302c056f4a4775ad5b57010f2ee5f53fb3dacdbdf6c53ade1927e315fcc26f7cdaa63

data/lib/drb_fileserver_plus.rb

@@ -5,21 +5,30 @@
 # description: Designed to provide fault tolerant access to a DRb file server
 #              when 2 or more back-end nodes are running.
 
+require 'sps-pub'
 require 'drb_fileclient'
 
 
 class DRbFileServer
 
-  def initialize(nodes)
+  def initialize(nodes, sps: nil, topic: 'file')
+    
     @nodes = nodes.map {|x| 'dfs://' + x}
     @failcount = 0
+    @sps, @topic = sps, topic
+    
   end
   
   def cp(path, path2)
-
+    
     file_op do |f|
       f.cp File.join(@nodes.first, path), File.join(@nodes.first, path2)
     end
+    
+    if @sps then
+      @sps.notice "%s/copy: %s %s" % [@topic, File.join(@nodes.first, path), 
+                               File.join(@nodes.first, path2)]
+    end
 
   end    
 
@@ -38,13 +47,21 @@ class DRbFileServer
   def mkdir(path)
 
     file_op {|f| f.mkdir File.join(@nodes.first, path) }
+    
+    if @sps then
+      @sps.notice "%s/mkdir: %s" % [@topic, File.join(@nodes.first, path)]    
+    end
 
   end
   
   def mkdir_p(path)
 
     file_op {|f| f.mkdir_p File.join(@nodes.first, path) }
-
+    
+    if @sps then
+      @sps.notice "%s/mkdir_p: %s" % [@topic, File.join(@nodes.first, path)]
+    end
+    
   end
   
   def mv(path, path2)
@@ -52,6 +69,11 @@ class DRbFileServer
     file_op do |f|
       f.mv File.join(@nodes.first, path), File.join(@nodes.first, path2)
     end
+    
+    if @sps then
+      @sps.notice "%s/mv: %s %s" % [@topic, File.join(@nodes.first, path), 
+                               File.join(@nodes.first, path2)]
+    end
 
   end   
   
@@ -64,6 +86,10 @@ class DRbFileServer
   def rm(fname)
 
     file_op {|f| f.rm File.join(@nodes.first, fname) }
+    
+    if @sps then
+      @sps.notice "%s/rm: %s" % [@topic, File.join(@nodes.first, fname)]
+    end
 
   end   
 
@@ -71,12 +97,20 @@ class DRbFileServer
 
     file_op {|f| f.write File.join(@nodes.first, fname), content }
     
+    if @sps then
+      @sps.notice("%s/write: %s" % [@topic, File.join(@nodes.first, fname)])
+    end
+    
   end
   
   def zip(fname, a)
 
     file_op {|f| f.zip File.join(@nodes.first, fname), a }
     
+    if @sps then
+      @sps.notice "%s/zip: %s" % [@topic, File.join(@nodes.first, fname)]
+    end
+    
   end  
   
 
@@ -103,15 +137,22 @@ end
 class DRbFileServerPlus
 
 
-  def initialize(host: 'localhost', port: '61010', nodes: [])
+  def initialize(host: 'localhost', port: '61010', nodes: [], sps_host: nil, 
+                 sps_port: '59010', sps_topic: 'file')
 
     @host, @port, @nodes = host, port, nodes
+    
+    if sps_host then
+      @sps = SPSPub.new(host: sps_host, port: sps_port) 
+      @topic = sps_topic
+    end
 
   end
 
   def start()
     
-    DRb.start_service "druby://#{@host}:#{@port}", DRbFileServer.new(@nodes)
+    DRb.start_service "druby://#{@host}:#{@port}", 
+        DRbFileServer.new(@nodes, sps: @sps, topic: @topic)
     DRb.thread.join
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileserver_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   IzajbtHbQOY56M17vmJw7Y9ei8bGWzjVxfRUg33mVpGQQIWHA2JpaJ8+jpwrxdbF
   DfzPJWgIRbTOgE4v1XGQcqsO
   -----END CERTIFICATE-----
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb_fileclient
@@ -46,7 +46,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
 description: 
 email: james@jamesrobertson.eu
 executables: []