durable_rules 0.34.56 → 0.34.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1839ca20ebfc39836490893e76d37423ce6bde97
-  data.tar.gz: 6c701a34e592b43a49fad96c2aa5d9e1c245fc2e
+  metadata.gz: 498fdfaaecffebdf986536f05cdf517d8e1388f1
+  data.tar.gz: 2eaf9c77fa2b171c8263d9eb408aaf434b211d10
 SHA512:
-  metadata.gz: 0d8038add6e89b2f41e93ea44f2f36788c42efc1d03bc6a73aeb30088b3b66f152b4a9da60b7dfee79f2a911af01033b8d75b31151bf8f8ae7ec7a6a0a9239a0
-  data.tar.gz: 31283e8ff9e14560170b600d098963eaa60862c8382d4429c8c5862d7d2de21d52c8ae282ccc5d0d377fe1150ef668811ed1c3709cb406ed59ed95024b021f9d
+  metadata.gz: 1677ae9c1459c7dd6310aa7c26502af432ddc2e69b5a8254541d7c633f7694a2f7df1459d53813ba4049a3e0a59f49a68da9515f4a5e85f5dd2d976b542175c2
+  data.tar.gz: 32eef26b4e7d94155664a9d85d2e217cd446fb9abb52a7b43940783b90a16ba367575cef1be028f71f024ffcc353f05202450797b91a10e48e52a09c764d0763

data/src/rules/events.c

@@ -2081,7 +2081,7 @@ unsigned int cancelTimer(unsigned int handle, char *sid, char *timerName) {
         return result;
     }
 
-    return removeTimer(rulesBinding, timerName);
+    return removeTimer(rulesBinding, sid, timerName);
 }
 
 unsigned int renewActionLease(unsigned int handle, char *sid) {

data/src/rules/net.c

@@ -533,11 +533,14 @@ static unsigned int loadRemoveTimerCommand(ruleset *tree, binding *rulesBinding)
     char *lua = NULL;
     if (asprintf(&lua,
 "local timer_key = \"%s!t\"\n"
-"local timer_name = ARGV[1]\n"
+"local sid = ARGV[1]\n"
+"local timer_name = ARGV[2]\n"
 "local res = redis.call(\"zrange\", timer_key, 0, -1)\n"
 "for i = 1, #res, 1 do\n"
 "    if string.find(res[i], \"\\\"%%$t\\\"%%s*:%%s*\\\"\" .. timer_name .. \"\\\"\") then\n"
-"        redis.call(\"zrem\", timer_key, res[i])\n"
+"        if string.find(res[i], \"\\\"sid\\\"%%s*:%%s*\\\"\" .. sid .. \"\\\"\") then\n"
+"            redis.call(\"zrem\", timer_key, res[i])\n"
+"        end\n"
 "    end\n"
 "end\n"
 "return 0\n", name)  == -1) {
@@ -3124,12 +3127,13 @@ unsigned int registerTimer(void *rulesBinding, unsigned int duration, char asser
     return RULES_OK;
 }
 
-unsigned int removeTimer(void *rulesBinding, char *timerName) {
+unsigned int removeTimer(void *rulesBinding, char *sid, char *timerName) {
     binding *currentBinding = (binding*)rulesBinding;
     redisContext *reContext = currentBinding->reContext;   
     int result = redisAppendCommand(reContext, 
-                                    "evalsha %s 0 %s", 
+                                    "evalsha %s 0 %s %s", 
                                     currentBinding->removeTimerHash,
+                                    sid,
                                     timerName); 
     VERIFY(result, "removeTimer");  
     return RULES_OK;

data/src/rules/net.h

@@ -137,6 +137,7 @@ unsigned int registerTimer(void *rulesBinding,
                            char *timer);
 
 unsigned int removeTimer(void *rulesBinding, 
+                         char *sid, 
                          char *timerName);
 
 unsigned int registerMessage(void *rulesBinding, 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.56
+  version: 0.34.57
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake