Fixed RedisPubsub bugs on returning sub_id from subscribe method

and bugs in unsubscribe method

Author: hballard

graphql_subscriptions/subscription_manager.py

@@ -22,6 +22,7 @@ def publish(self, trigger_name, message):
         return True
 
     def subscribe(self, trigger_name, on_message_handler, options):
+        self.sub_id_counter += 1
         try:
             if trigger_name not in self.subscriptions.values()[0]:
                 self.pubsub.subscribe(trigger_name)
@@ -31,7 +32,6 @@ def subscribe(self, trigger_name, on_message_handler, options):
             trigger_name,
             on_message_handler
         ]
-        self.sub_id_counter += 1
         if not self.greenlet:
             self.greenlet = gevent.spawn(
                 self.wait_and_get_message
@@ -43,9 +43,9 @@ def unsubscribe(self, sub_id):
         del self.subscriptions[sub_id]
         try:
             if trigger_name not in self.subscriptions.values()[0]:
-                self.pubsub.subscribe(trigger_name)
+                self.pubsub.unsubscribe(trigger_name)
         except IndexError:
-            self.pubsub.subscribe(trigger_name)
+            self.pubsub.unsubscribe(trigger_name)
         if not self.subscriptions:
             self.greenlet = self.greenlet.kill()
 

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='graphql-subscriptions',
-    version='0.1.5',
+    version='0.1.6',
     author='Heath Ballard',
     author_email='heath.ballard@gmail.com',
     description=('A port of apollo-graphql subscriptions for python, using\