syncache 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9a99425eda744305f5d8040e296132bff7e063
-  data.tar.gz: 5b9352dd51839233cf65b4463d00b378b6a76cf1
+  metadata.gz: c487d4bfefbcf5d5e454a7e2f8327ddac723078b
+  data.tar.gz: 143b0b8757fe2e0c37b18d3d74e10c9287b2c360
 SHA512:
-  metadata.gz: 9fae2c8ec3d435e712430fb251df22472dea9dff97ca8632d0335e416da449665357d4b799d5868c61b34b13376cb95c65e9798851e76ffc097ec3068c5afa01
-  data.tar.gz: 333db769142c045ee37527ca36384e491446e39410d82ce3f19a858d144eb4573ab1847c3d6d99723bb478986c5a4bc3543b21406f27dd3ac6fea97d967bff43
+  metadata.gz: 49a98a66e098c88d99b4eac27c226d258ba93576ec7d24c6aa4d2f8f59cb8a149606ac455c6c6e747fd07dd789a7ba0c47c55fd473a1342c1d9370148ce89239
+  data.tar.gz: fa146f3504e6c3b782fbbe6a347a02242a549f3e3bb1098ed8540df20cc23aa87192977815195261d3f17d65c34c1f335808b83b1e3ce170bbb6d5f51466a078

data/Rakefile

@@ -0,0 +1,18 @@
+# SynCache dRuby object cache server
+# (originally written for Samizdat project)
+#
+#   Copyright (c) 2002-2012, 2016  Dmitry Borodaenko <angdraug@debian.org>
+#
+#   This program is free software.
+#   You can distribute/modify this program under the terms of
+#   the GNU General Public License version 3 or later.
+#
+# vim: et sw=2 sts=2 ts=8 tw=0
+
+require "rake"
+
+task :default => :test
+
+task :test do
+  sh %{#{FileUtils::RUBY} -I. -Ilib test/ts_syncache.rb}
+end

data/bin/syncache-drb

@@ -28,7 +28,7 @@ Options:
 
   URI
       URI with druby: schema that DRb server binds to, default is
-      druby://localhost:9000
+      druby://*:9000
 
   --help
       display this message and quit
@@ -60,6 +60,10 @@ Options:
       /var/run/#{PNAME}/ when run as root, or under $TMPDIR
       otherwise. Location should be writeable by USER.
 
+  --foreground
+      Do not daemonize, switch to a different user, create pidfile,
+      redirect output, or log to syslog.
+
 }
     exit
   end
@@ -73,10 +77,11 @@ Options:
       [ '--user', '-u', GetoptLong::REQUIRED_ARGUMENT ],
       [ '--error-log', '-e', GetoptLong::REQUIRED_ARGUMENT ],
       [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
-      [ '--pidfile', '-p', GetoptLong::REQUIRED_ARGUMENT ]
+      [ '--pidfile', '-p', GetoptLong::REQUIRED_ARGUMENT ],
+      [ '--foreground', GetoptLong::NO_ARGUMENT ]
     )
 
-    @uri = 'druby://localhost:9000'
+    @uri = 'druby://*:9000'
     @ttl = 24*60*60
     @size = 10000
     @flush_delay = nil
@@ -85,7 +90,9 @@ Options:
     @debug = false
     @pidfile = (0 == Process.uid) ?
       "/var/run/#{PNAME}/#{PNAME}.pid" :
-      (ENV.has_key?('TMPDIR') ? ENV['TMPDIR'] : '/tmp') + "/#{PNAME}.pid"
+      File.join((ENV.has_key?('TMPDIR') ? ENV['TMPDIR'].dup.untaint : '/tmp'),
+                "#{PNAME}.pid")
+    @foreground = false
 
     opts.each do |opt, arg|
       case opt
@@ -105,6 +112,8 @@ Options:
         @debug = true
       when '--pidfile'
         @pidfile = arg.dup.untaint
+      when '--foreground'
+        @foreground = true
       end
     end
 
@@ -183,14 +192,16 @@ Options:
 
   def wait_for_shutdown
     DRb.thread.join
-    File.delete @pidfile
+    File.delete @pidfile unless @foreground
     log 'shut down'
   end
 
   def run
     set_options
-    daemonize
-    open_syslog unless @debug and @error_log
+    unless @foreground
+      daemonize
+      open_syslog unless @debug and @error_log
+    end
     begin
       ready
       trap_signals

data/lib/syncache/remote.rb

@@ -74,9 +74,9 @@ class RemoteCache
         value = @cache[key]
       end
 
-      if value.kind_of?(Placeholder)
-        # ran out of time: give up and do it ourselves
-        @cache.delete(key)
+      if value.kind_of?(Placeholder) or value.nil?
+        # the other client timed out or got flushed;
+        # reset the placeholder ttl and do it ourselves
         @cache[key] = Placeholder.new
         value = @cache[key] = yield
       end

data/man/syncache-drb.1

@@ -14,7 +14,7 @@ replacement strategy.
 .SH "OPTIONS" 
 .IP "\fBURI\fP" 4
 A URI with druby: schema that the DRb server binds to, default is
-\fBdruby://localhost:9000\fP
+\fBdruby://*:9000\fP
 .IP "\fB--help\fP" 4
 Display usage information and quit.
 .IP "\fB--ttl\fP SECONDS" 4
@@ -36,6 +36,9 @@ messages will be sent there instead of syslog.
 Path to pidfile. By default, pidfile is created under /var/run/syncache-drb/
 when run as root, or under $TMPDIR otherwise. Location should be writeable by
 USER.
+.IP "\fB--foreground\fP" 4
+Do not daemonize, switch to a different user, create pidfile, redirect output,
+or log to syslog.
 
 .SH "AUTHOR" 
 .PP 

data/syncache.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'syncache'
-  spec.version     = '1.3'
+  spec.version     = '1.4'
   spec.author      = 'Dmitry Borodaenko'
   spec.email       = 'angdraug@debian.org'
   spec.homepage    = 'https://github.com/angdraug/syncache'
@@ -18,8 +18,10 @@ two-level locking mechanism which ensures that:
    and as soon as the first thread completes the operation, the result will be
    returned to all threads.
     EOF
-  spec.files       = `git ls-files`.split "\n"
+  spec.files       = %w(COPYING ChangeLog.mtn README.rdoc setup.rb Rakefile
+                        syncache.gemspec bin/syncache-drb man/syncache-drb.1) +
+                     Dir['{lib,test}/**/*.rb']
   spec.test_files  = Dir['test/ts_*.rb']
   spec.executables = spec.files.map{|p| p =~ /^bin\/(.*)/ ? $1 : nil }.compact
-  spec.license     = 'GPL3+'
+  spec.license     = 'GPL-3.0+'
 end

data/test/ts_syncache.rb

@@ -10,6 +10,5 @@
 #
 # vim: et sw=2 sts=2 ts=8 tw=0
 
-require 'test/unit'
 require 'test/tc_syncache'
 require 'test/tc_remote'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncache
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Dmitry Borodaenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies: []
 description: |
   SynCache stores cached objects in a Hash that is protected by an advanced
@@ -31,6 +31,7 @@ files:
 - COPYING
 - ChangeLog.mtn
 - README.rdoc
+- Rakefile
 - bin/syncache-drb
 - lib/syncache.rb
 - lib/syncache/remote.rb
@@ -43,7 +44,7 @@ files:
 - test/ts_syncache.rb
 homepage: https://github.com/angdraug/syncache
 licenses:
-- GPL3+
+- GPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -61,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Thread-safe time-limited cache with flexible replacement policy