durable_rules 0.34.13 → 0.34.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd70ca841544d3e07d8539921a26b4952a8dbff
-  data.tar.gz: 439eb6309117246431351766b4c6dea31a2811bc
+  metadata.gz: 0aeecc3ee5cdf6e3bd695b9dcd7e8509b4506b0c
+  data.tar.gz: 4d6702f881de8b18f93e498bcc21a6cc2299c11e
 SHA512:
-  metadata.gz: 696e69e72419ce0aa287e69be0cec037fbaffc0a3e114f3d52c47e2112f271cdd99f30ebabdbfc4dfc19f416cae5a5eefccf2f8feffa06def0a3f738ab783908
-  data.tar.gz: 71bc5d5b8dd85662b26acac829b6694cdae2cca96577b635c98141dfaf31c405a0005f19788f8212c339e351b745e13833bbf522fdfc929ea600118e00d28b35
+  metadata.gz: b91eda96fb2f9ff19faf9a92f0be6f97da3f577d5b997d067627f5d8b2d3a7976e479095302cb1487b83705263bea66e8943aea4858ae4ad502c228f648fc450
+  data.tar.gz: d55512808c130ff767d6172e969a612d691d6ff0600042907c47d28284cdbb4277669d0533b154a58351d795de317d1451c11754f69941cff3287a6b0b39d0c1

data/librb/durable.rb

@@ -5,11 +5,11 @@ module Durable
   @@rulesets = {}
   @@start_blocks = []
 
-  def self.create_queue(ruleset_name, database = {:host => 'localhost', :port => 6379, :password => nil}, state_cache_size = 1024)
+  def self.create_queue(ruleset_name, database = {:host => 'localhost', :port => 6379, :password => nil, :db => 0}, state_cache_size = 1024)
     Engine::Queue.new ruleset_name, database, state_cache_size
   end
 
-  def self.create_host(databases = [{:host => 'localhost', :port => 6379, :password => nil}], state_cache_size = 1024)
+  def self.create_host(databases = [{:host => 'localhost', :port => 6379, :password => nil, :db => 0}], state_cache_size = 1024)
     main_host = Engine::Host.new @@rulesets, databases, state_cache_size
     for block in @@start_blocks
       main_host.instance_exec main_host, &block
@@ -18,7 +18,7 @@ module Durable
     main_host
   end
 
-  def self.run_all(databases = [{:host => 'localhost', :port => 6379, :password => nil}], host_name = nil, port = nil, run = nil, state_cache_size = 1024)
+  def self.run_all(databases = [{:host => 'localhost', :port => 6379, :password => nil, :db => 0}], host_name = nil, port = nil, run = nil, state_cache_size = 1024)
     main_host = self.create_host databases, state_cache_size
     Interface::Application.set_host main_host
     if run
@@ -241,6 +241,12 @@ module Durable
       self
     end
 
+    def matches(other)
+      @__op = :$mt
+      @right = other
+      self
+    end
+
     def -@
       @__op = :$nex
       @right = 1

data/librb/engine.rb

@@ -419,9 +419,9 @@ module Engine
     def bind(databases)
       for db in databases do
         if db.kind_of? String
-          Rules.bind_ruleset @handle, db, 0, nil
+          Rules.bind_ruleset @handle, db, 0, nil, 0
         else
-          Rules.bind_ruleset @handle, db[:host], db[:port], db[:password]
+          Rules.bind_ruleset @handle, db[:host], db[:port], db[:password], db[:db]
         end
       end
     end
@@ -1086,7 +1086,7 @@ module Engine
 
   class Host
 
-    def initialize(ruleset_definitions = nil, databases = [{:host => 'localhost', :port => 6379, :password => nil}], state_cache_size = 1024)
+    def initialize(ruleset_definitions = nil, databases = [{:host => 'localhost', :port => 6379, :password => nil, :db => 0}], state_cache_size = 1024)
       @ruleset_directory = {}
       @ruleset_list = []
       @databases = databases
@@ -1303,13 +1303,13 @@ module Engine
 
   class Queue
 
-    def initialize(ruleset_name, database = {:host => 'localhost', :port => 6379, :password => nil}, state_cache_size = 1024)
+    def initialize(ruleset_name, database = {:host => 'localhost', :port => 6379, :password => nil, :db => 0}, state_cache_size = 1024)
       @_ruleset_name = ruleset_name.to_s
       @handle = Rules.create_client @_ruleset_name, state_cache_size
       if database.kind_of? String
-        Rules.bind_ruleset @handle, database, 0, nil
+        Rules.bind_ruleset @handle, database, 0, nil, 0
       else
-        Rules.bind_ruleset @handle, database[:host], database[:port], database[:password]
+        Rules.bind_ruleset @handle, database[:host], database[:port], database[:password], database[:db]
       end
     end
 

data/src/rules/Makefile

@@ -1,4 +1,4 @@
-OBJ=events.o json.o net.o rete.o state.o
+OBJ=events.o json.o net.o rete.o state.o regex.o
 LIBNAME=librules
 
 # Fallback to gcc when $CC is not in $PATH.
@@ -16,11 +16,12 @@ STLIB_MAKE_CMD=ld $(ARCH) -o $(STLIBNAME) -L../../deps/hiredis/ -lhiredis -r
 all: $(STLIBNAME)
 
 # Deps (use make dep to generate this)
-events.o: events.c rules.h net.h json.h
+events.o: events.c rules.h net.h json.h regex.h
 json.o: json.c json.h rules.h
 net.o: net.c net.h rules.h json.h rete.h
-rete.o: rete.c rete.h net.h json.h state.h
+rete.o: rete.c rete.h net.h json.h state.h regex.h
 state.o: state.c state.h json.h net.h
+regex.o: regex.c regex.h rules.h
 
 $(STLIBNAME): $(OBJ)
 	$(STLIB_MAKE_CMD) $(OBJ)

data/src/rules/events.c

@@ -5,6 +5,9 @@
 #include "rules.h"
 #include "net.h"
 #include "json.h"
+#include "regex.h"
+
+#include <time.h> 
 
 #define MAX_EVENT_PROPERTIES 64
 #define MAX_RESULT_NODES 32
@@ -35,6 +38,7 @@
 #define OP_STRING_DOUBLE 0x0103
 #define OP_STRING_STRING 0x0101
 #define OP_STRING_NIL 0x0107
+#define OP_STRING_REGEX 0x010C
 #define OP_NIL_BOOL 0x0704
 #define OP_NIL_INT 0x0702
 #define OP_NIL_DOUBLE 0x0703
@@ -893,6 +897,15 @@ static unsigned int isMatch(ruleset *tree,
             }
 
             break;
+        case OP_STRING_REGEX:
+            *propertyMatch = evaluateRegex(tree,
+                                           message + currentProperty->valueOffset, 
+                                           currentProperty->valueLength, 
+                                           currentAlpha->right.value.regex.vocabularyLength,
+                                           currentAlpha->right.value.regex.statesLength,
+                                           currentAlpha->right.value.regex.stateMachineOffset);
+            break;
+
     }
     
     if (releaseRightState) {

data/src/rules/json.h

@@ -14,6 +14,7 @@
 #define JSON_EVENT_PROPERTY 0x09
 #define JSON_STATE_IDIOM 0x0A
 #define JSON_EVENT_IDIOM 0x0B
+#define JSON_REGEX 0x0C
 
 unsigned int readNextName(char *start, char **first, char **last, unsigned int *hash);
 unsigned int readNextValue(char *start, char **first, char **last, unsigned char *type);

data/src/rules/net.c

@@ -11,6 +11,39 @@
 #include "rules.h"
 #include "json.h"
 
+#define VERIFY(result, origin) do { \
+    if (result != REDIS_OK) { \
+        return ERR_REDIS_ERROR; \
+    } \
+    redisReply *reply; \
+    result = tryGetReply(reContext, &reply); \
+    if (result != RULES_OK) { \
+        return result; \
+    } \
+    if (reply->type == REDIS_REPLY_ERROR) { \
+        printf(origin); \
+        printf(" err string %s\n", reply->str); \
+        freeReplyObject(reply); \
+        return ERR_REDIS_ERROR; \
+    } \
+    freeReplyObject(reply);\
+} while(0)
+
+#define GET_REPLY(result, origin, reply) do { \
+    if (result != REDIS_OK) { \
+        return ERR_REDIS_ERROR; \
+    } \
+    result = tryGetReply(reContext, &reply); \
+    if (result != RULES_OK) { \
+        return result; \
+    } \
+    if (reply->type == REDIS_REPLY_ERROR) { \
+        printf(origin); \
+        printf(" err string %s\n", reply->str); \
+        freeReplyObject(reply); \
+        return ERR_REDIS_ERROR; \
+    } \
+} while(0)
 
 #ifdef _WIN32
 int asprintf(char** ret, char* format, ...){
@@ -39,6 +72,25 @@ int asprintf(char** ret, char* format, ...){
 }
 #endif
 
+static unsigned int tryGetReply(redisContext *reContext, 
+                                redisReply **reply) {
+
+    if (redisGetReply(reContext, (void**)reply) != REDIS_OK) {
+        printf("getReply err %d, %d, %s\n", reContext->err, errno, reContext->errstr);
+        #ifndef _WIN32
+        if (redisReconnect(reContext) != REDIS_OK) {
+            printf("reconnect err %d, %d, %s\n", reContext->err, errno, reContext->errstr);
+            return ERR_REDIS_ERROR;
+        }
+        return ERR_TRY_AGAIN;
+        #else
+        return ERR_REDIS_ERROR;
+        #endif
+    }
+
+    return RULES_OK;
+}
+
 static unsigned int createIdiom(ruleset *tree, jsonValue *newValue, char **idiomString) {
     char *rightProperty;
     char *rightAlias;
@@ -322,13 +374,8 @@ static unsigned int loadPartitionCommand(ruleset *tree, binding *rulesBinding) {
         return ERR_OUT_OF_MEMORY;
     }
 
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua); 
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua); 
+    GET_REPLY(result, "loadPartitionCommand", reply);
 
     strncpy(rulesBinding->partitionHash, reply->str, 40);
     rulesBinding->partitionHash[40] = '\0';
@@ -373,15 +420,8 @@ static unsigned int loadRemoveActionCommand(ruleset *tree, binding *rulesBinding
         return ERR_OUT_OF_MEMORY;
     }
 
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        free(lua);
-        return ERR_REDIS_ERROR;
-    }
-
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadRemoveActionCommand", reply);
     strncpy(rulesBinding->removeActionHash, reply->str, 40);
     rulesBinding->removeActionHash[40] = '\0';
     freeReplyObject(reply);
@@ -410,13 +450,8 @@ static unsigned int loadTimerCommand(ruleset *tree, binding *rulesBinding) {
         return ERR_OUT_OF_MEMORY;
     }
 
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadTimerCommand", reply);
 
     strncpy(rulesBinding->timersHash, reply->str, 40);
     rulesBinding->timersHash[40] = '\0';
@@ -440,13 +475,8 @@ static unsigned int loadUpdateActionCommand(ruleset *tree, binding *rulesBinding
         return ERR_OUT_OF_MEMORY;
     }
 
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadUpdateActionCommand", reply);
 
     strncpy(rulesBinding->updateActionHash, reply->str, 40);
     rulesBinding->updateActionHash[40] = '\0';
@@ -548,14 +578,8 @@ static unsigned int loadDeleteSessionCommand(ruleset *tree, binding *rulesBindin
     }
 
     free(deleteSessionLua);
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        free(lua);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadDeleteSessionCommand", reply);
 
     strncpy(rulesBinding->deleteSessionHash, reply->str, 40);
     rulesBinding->deleteSessionHash[40] = '\0';
@@ -708,14 +732,8 @@ static unsigned int loadAddMessageCommand(ruleset *tree, binding *rulesBinding)
     }
 
     free(addMessageLua);
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        free(lua);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadAddMessageCommand", reply);
 
     strncpy(rulesBinding->addMessageHash, reply->str, 40);
     rulesBinding->addMessageHash[40] = '\0';
@@ -1188,14 +1206,8 @@ static unsigned int loadPeekActionCommand(ruleset *tree, binding *rulesBinding)
         return ERR_OUT_OF_MEMORY;
     }
     free(peekActionLua);
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        free(lua);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadPeekActionCommand", reply);
 
     strncpy(rulesBinding->peekActionHash, reply->str, 40);
     rulesBinding->peekActionHash[40] = '\0';
@@ -2140,14 +2152,8 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
     }
 
     free(oldLua);
-    redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
-    redisGetReply(reContext, (void**)&reply);
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("%s\n", reply->str);
-        freeReplyObject(reply);
-        free(lua);
-        return ERR_REDIS_ERROR;
-    }
+    unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
+    GET_REPLY(result, "loadEvalMessageCommand", reply);
 
     strncpy(rulesBinding->evalMessageHash, reply->str, 40);
     rulesBinding->evalMessageHash[40] = '\0';
@@ -2262,7 +2268,8 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
 unsigned int bindRuleset(void *handle, 
                          char *host, 
                          unsigned int port, 
-                         char *password) {
+                         char *password,
+                         unsigned char db) {
     ruleset *tree = (ruleset*)handle;
     bindingsList *list;
     if (tree->bindingsList) {
@@ -2293,32 +2300,26 @@ unsigned int bindRuleset(void *handle,
         return ERR_CONNECT_REDIS;
     }
 
+    int result = REDIS_OK;
+
+#ifndef _WIN32
     struct timeval tv;
     tv.tv_sec = 10;
     tv.tv_usec = 0;
-    int result = redisSetTimeout(reContext, tv);
+    result = redisSetTimeout(reContext, tv);
     if (result != REDIS_OK) {
         return ERR_REDIS_ERROR;
     }
+#endif
 
     if (password != NULL) {
         result = redisAppendCommand(reContext, "auth %s", password);
-        if (result != REDIS_OK) {
-            return ERR_REDIS_ERROR;
-        }
-
-        redisReply *reply;
-        result = redisGetReply(reContext, (void**)&reply);
-        if (result != REDIS_OK) {
-            return ERR_REDIS_ERROR;
-        }
-        
-        if (reply->type == REDIS_REPLY_ERROR) {
-            freeReplyObject(reply);   
-            return ERR_REDIS_ERROR;
-        }
+        VERIFY(result, "bindRuleset");
+    }
 
-        freeReplyObject(reply);
+    if (db) {
+        result = redisAppendCommand(reContext, "select %d", db);
+        VERIFY(result, "bindRuleset");
     }
 
     if (!list->bindings) {
@@ -2365,20 +2366,8 @@ unsigned int getBindingIndex(ruleset *tree, unsigned int sidHash, unsigned int *
                                     firstBinding->partitionHash, 
                                     sidHash, 
                                     list->bindingsLength);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-
     redisReply *reply;
-    result = redisGetReply(reContext, (void**)&reply);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-    
-    if (reply->type == REDIS_REPLY_ERROR) {
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    } 
+    GET_REPLY(result, "loadEvalMessageCommand", reply);
 
     *bindingIndex = reply->integer;
     freeReplyObject(reply);
@@ -2746,25 +2735,6 @@ unsigned int startNonBlockingBatch(void *rulesBinding,
     return result;
 }
 
-static unsigned int tryGetReply(redisContext *reContext, 
-                                redisReply **reply) {
-
-    if (redisGetReply(reContext, (void**)reply) != REDIS_OK) {
-        printf("getReply err %d, %d, %s\n", reContext->err, errno, reContext->errstr);
-        #ifndef _WIN32
-        if (redisReconnect(reContext) != REDIS_OK) {
-            printf("reconnect err %d, %d, %s\n", reContext->err, errno, reContext->errstr);
-            return ERR_REDIS_ERROR;
-        }
-        return ERR_TRY_AGAIN;
-        #else
-        return ERR_REDIS_ERROR;
-        #endif
-    }
-
-    return RULES_OK;
-}
-
 unsigned int completeNonBlockingBatch(void *rulesBinding,
                                       unsigned int replyCount) {
     if (replyCount == 0) {
@@ -2873,23 +2843,7 @@ unsigned int removeMessage(void *rulesBinding, char *sid, char *mid) {
                                     currentBinding->factsHashset, 
                                     sid, 
                                     mid);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-
-    redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("removeMessage err string %s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-    
-    freeReplyObject(reply);    
+    VERIFY(result, "removeMessage");   
     return RULES_OK;
 }
 
@@ -2980,23 +2934,7 @@ unsigned int registerTimer(void *rulesBinding, unsigned int duration, char *time
                                     currentBinding->timersSortedset, 
                                     currentTime + duration, 
                                     timer);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-    
-    redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("registerTimer err string %s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
-    freeReplyObject(reply);    
+    VERIFY(result, "registerTimer");   
     return RULES_OK;
 }
 
@@ -3008,23 +2946,7 @@ unsigned int removeTimer(void *rulesBinding, char *timer) {
                                     "zrem %s p:%s", 
                                     currentBinding->timersSortedset,
                                     timer);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-    
-    redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("deleteTimer err string %s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
-    freeReplyObject(reply);    
+    VERIFY(result, "removeTimer");  
     return RULES_OK;
 }
 
@@ -3059,23 +2981,7 @@ unsigned int registerMessage(void *rulesBinding, unsigned int queueAction, char
             break;
     }
     
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-    
-    redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("registerMessage err string %s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
-    freeReplyObject(reply);    
+    VERIFY(result, "registerMessage");  
     return RULES_OK;
 }
 
@@ -3086,21 +2992,8 @@ unsigned int getSession(void *rulesBinding, char *sid, char **state) {
                                 "hget %s %s", 
                                 currentBinding->sessionHashset, 
                                 sid);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-
     redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
+    GET_REPLY(result, "getSession", reply);
     if (reply->type != REDIS_REPLY_STRING) {
         freeReplyObject(reply);
         return ERR_NEW_SESSION;
@@ -3122,21 +3015,9 @@ unsigned int getSessionVersion(void *rulesBinding, char *sid, unsigned long *sta
                                              "hget %s!v %s", 
                                              currentBinding->sessionHashset, 
                                              sid);
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-
+    
     redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
+    GET_REPLY(result, "getSessionVersion", reply);
     if (reply->type != REDIS_REPLY_INTEGER) {
         *stateVersion = 0;
     } else {
@@ -3155,23 +3036,7 @@ unsigned int deleteSession(void *rulesBinding, char *sid) {
                                     "evalsha %s 0 %s", 
                                     currentBinding->deleteSessionHash,
                                     sid); 
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-    
-    redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("deleteSession err string %s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
-    freeReplyObject(reply);  
+    VERIFY(result, "deleteSession");  
     return REDIS_OK;
 }
 
@@ -3185,22 +3050,6 @@ unsigned int updateAction(void *rulesBinding, char *sid) {
                                     currentBinding->updateActionHash,
                                     sid,
                                     currentTime + 15); 
-    if (result != REDIS_OK) {
-        return ERR_REDIS_ERROR;
-    }
-    
-    redisReply *reply;
-    result = tryGetReply(reContext, &reply);
-    if (result != RULES_OK) {
-        return result;
-    }
-
-    if (reply->type == REDIS_REPLY_ERROR) {
-        printf("updateAction err string %s\n", reply->str);
-        freeReplyObject(reply);
-        return ERR_REDIS_ERROR;
-    }
-
-    freeReplyObject(reply);    
+    VERIFY(result, "updateAction");  
     return RULES_OK;
 }