Client ids need to be unique per deployment

[plstackapi.git] / planetstack / observer / event_manager.py

diff --git a/planetstack/observer/event_manager.py b/planetstack/observer/event_manager.py
index c4215ac..da3bd51 100644 (file)
--- a/planetstack/observer/event_manager.py
+++ b/planetstack/observer/event_manager.py
@@ -1,8 +1,6 @@
 import threading
 import requests, json
 
-from core.models import *
-#from openstack.manager import OpenStackManager
 from planetstack.config import Config
 from observer.deleters import deleters
 
@@ -11,15 +9,15 @@ import base64
 from fofum import Fofum
 import json
 
-# decorator that marks dispatachable event methods     
+# decorator that marks dispatachable event methods       
 def event(func):
        setattr(func, 'event', func.__name__)
-       return func              
+       return func                     
 
 class EventHandler:
        # This code is currently not in use.
        def __init__(self):
-               pass #self.manager = OpenStackManager()
+               pass 
 
        @staticmethod
        def get_events():
@@ -38,12 +36,16 @@ class EventHandler:
 class EventSender:
        def __init__(self,user=None,clientid=None):
                try:
-                       clid = Config().feefie_client_id
                        user = Config().feefie_client_user
                except:
-                       clid = 'planetstack_core_team'
                        user = 'pl'
 
+               try:
+                       clid = Config().feefie_client_id
+               except:
+                       clid = self.random_client_id()
+                       
+
                self.fofum = Fofum(user=user)
                self.fofum.make(clid)
 
@@ -72,18 +74,28 @@ class EventListener:
                if (not deletion and self.wake_up):
                        self.wake_up()
                
-
+       def random_client_id(self):
+               if (self.client_id):
+                       return self.client_id
+               else:
+                       self.client_id = base64.urlsafe_b64encode(os.urandom(12))
+                       return self.client_id
+
+       
        def run(self):
                # This is our unique client id, to be used when firing and receiving events
                # It needs to be generated once and placed in the config file
 
                try:
-                       clid = Config().feefie_client_id
                        user = Config().feefie_client_user
                except:
-                       clid = 'planetstack_core_team'
                        user = 'pl'
 
+               try:
+                       clid = Config().feefie_client_id
+               except:
+                       clid = self.random_client_id()
+
                f = Fofum(user=user)
                
                listener_thread = threading.Thread(target=f.listen_for_event,args=(clid,self.handle_event))