workflow_manager 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c00265553f6ee24f60116455ad308ce4f880ca
-  data.tar.gz: 7a76ec915498d09ec76e8504ffd9c53bf2b68954
+  metadata.gz: '08c87b93bcb1fc9aadd48bea307f1543787acf79'
+  data.tar.gz: 89fd672a4e1ec7929c6e7dbf19597bed82afc110
 SHA512:
-  metadata.gz: fd80735df1170477400d0501bd4c5407598f48560c6af06d3acadc82f93c95f64371b0b0829681710712476b3465063eda608bf89122f83457664676de819f9c
-  data.tar.gz: f4809de592cddf922cb6c7d3b0d85e3936503d1bf97c82e96107f1a7dcf5984f09b7abd72abe50f56c1a1db9234bcf7e454f44ec78875c2ad95d2ea5b3bbe7ed
+  metadata.gz: 87f5d37dd1394ef6bbb894e163a629c12eb590a270edab39c16b892b1437cbace16245132713057dcc45a3879bfa3cc6512615e6177b9ebb55facc75d893d769
+  data.tar.gz: '095e8de179697c6c07278e99ace552ab8f21ee025408a0617fbe4148d71fcaf12cf09b884ec648d9054c30eef8e191c7a2b6395a73a0c7c965d8603ac20eb458'

data/lib/workflow_manager/server.rb

@@ -100,6 +100,7 @@ module WorkflowManager
       end
     end
     class RedisDB
+      attr_accessor :port
       def run_redis_server(redis_conf)
         @pid = fork do
           exec("redis-server #{redis_conf}")
@@ -108,11 +109,13 @@ module WorkflowManager
           Process.waitpid @pid
         end
       end
-      def initialize(db_no=0, redis_conf=nil)
+      def initialize(db_no=0, redis_conf)
         if db_no==0
           run_redis_server(redis_conf)
         end
-        @db = Redis.new(db: db_no)
+        conf = Hash[*CSV.readlines(redis_conf, col_sep: " ").map{|a| [a.first, a[1,100].join(",")]}.flatten]
+        @port = (conf["port"]||6379).to_i
+        @db = Redis.new(port: @port, db: db_no)
       end
       def transaction
         #@db.multi do
@@ -154,7 +157,7 @@ module WorkflowManager
                   when "KyotoCabinet"
                     KyotoDB.new(@db_logs)
                   when "Redis"
-                    RedisDB.new(1)
+                    RedisDB.new(1, @redis_conf)
                 end
 
       @system_log = File.join(@log_dir, "system.log")
@@ -163,6 +166,7 @@ module WorkflowManager
       puts("DB = #{DB_MODE}")
       if DB_MODE == "Redis"
         puts("Redis conf = #{config.redis_conf}")
+        puts("Redis port = #{@logs.port}")
       end
       puts("Cluster = #{@cluster.name}")
       log_puts("DB = #{DB_MODE}")

data/lib/workflow_manager/version.rb

@@ -1,3 +1,3 @@
 module WorkflowManager
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workflow_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Functional Genomics Center Zurich