Improve exception handling #15

ra1u · Sep 22, 2019 · 9c66e8b · 9c66e8b
1 parent 7e135cd
commit 9c66e8b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 12 deletions.
diff --git a/lib/cas.dart b/lib/cas.dart
@@ -52,9 +52,14 @@ class Cas{
           _completer_bool.complete(false); //terminate Future.doWhile
         }
         else{
-          _completer_bool.complete(true);
+          // exec completes only with valid response
+          _completer_bool.completeError(RedisError("exec response is not expceted, but is $resp"));
         }
-      });
+      })
+      .catchError((e){
+          // dont do anything
+         _completer_bool.complete(true); // retry
+       }, test: (e) => e is TransactionError);
     });
   }
 }
diff --git a/lib/exceptions.dart b/lib/exceptions.dart
@@ -0,0 +1,25 @@
+/*
+ * Free software licenced under 
+ * GNU AFFERO GENERAL PUBLIC LICENSE
+ * 
+ * Check for document LICENCE forfull licence text
+ * 
+ * Luka Rahne
+ */
+
+part of redis;
+
+
+class RedisError  {
+  String e;
+  RedisError(this.e);
+  String toString() { return "RedisError($e)";}
+}
+
+
+class TransactionError  {
+  String e;
+  TransactionError(this.e);
+  String toString() { return "TranscationError($e)";}
+}
+
diff --git a/lib/redis.dart b/lib/redis.dart
@@ -24,3 +24,4 @@ part './redisparser.dart';
 part './command.dart';
 part './pubsub.dart';
 part './cas.dart';
+part './exceptions.dart';
diff --git a/lib/redisparser.dart b/lib/redisparser.dart
@@ -9,12 +9,6 @@
 
 part of redis;
 
-class RedisError{
-  String e;
-  RedisError(this.e);
-  String toString() { return "RedisError($e)";}
-}
-
 
 class RedisParser{
   static final UTF8 = const Utf8Codec();

diff --git a/lib/transaction.dart b/lib/transaction.dart
@@ -49,14 +49,12 @@ class Transaction extends Command{
     transaction_completed = true;
     return super.send_object(["EXEC"])
     .then((list){
-
       if(list == null){ //we got explicit error from redis
         while(_queue.isNotEmpty){
           Completer c =_queue.removeFirst();
-          c.complete(new RedisError("Transaction terminated"));
-          return null;
         }
-        return null;
+        throw TransactionError("transaction error ");
+        //return null;
       }
       else{
         if(list.length != _queue.length){