From 833407dd4c8803d4533d43f3a31b6198924fda3b Mon Sep 17 00:00:00 2001
From: Steve Nyemba <steve@3ridu-warmachine.attlocal.net>
Date: Mon, 20 Nov 2017 02:24:04 -0600
Subject: [PATCH] changes with utils

---
 src/utils/__init__.py              |  0
 src/utils/agents/__init__.py       |  0
 src/utils/agents/actor.py          |  0
 src/utils/agents/data-collector.py |  0
 src/utils/agents/learner.py        |  0
 src/utils/agents/manager.py        |  7 +++----
 src/utils/mailer.py                |  0
 src/utils/ml.py                    |  0
 src/utils/params.py                |  0
 src/utils/register.py              | 16 +++++++++++-----
 src/utils/transport.py             |  0
 11 files changed, 14 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 src/utils/__init__.py
 mode change 100644 => 100755 src/utils/agents/__init__.py
 mode change 100644 => 100755 src/utils/agents/actor.py
 mode change 100644 => 100755 src/utils/agents/data-collector.py
 mode change 100644 => 100755 src/utils/agents/learner.py
 mode change 100644 => 100755 src/utils/agents/manager.py
 mode change 100644 => 100755 src/utils/mailer.py
 mode change 100644 => 100755 src/utils/ml.py
 mode change 100644 => 100755 src/utils/params.py
 mode change 100644 => 100755 src/utils/register.py
 mode change 100644 => 100755 src/utils/transport.py

diff --git a/src/utils/__init__.py b/src/utils/__init__.py
old mode 100644
new mode 100755
diff --git a/src/utils/agents/__init__.py b/src/utils/agents/__init__.py
old mode 100644
new mode 100755
diff --git a/src/utils/agents/actor.py b/src/utils/agents/actor.py
old mode 100644
new mode 100755
diff --git a/src/utils/agents/data-collector.py b/src/utils/agents/data-collector.py
old mode 100644
new mode 100755
diff --git a/src/utils/agents/learner.py b/src/utils/agents/learner.py
old mode 100644
new mode 100755
diff --git a/src/utils/agents/manager.py b/src/utils/agents/manager.py
old mode 100644
new mode 100755
index 5a4f6db..a64f16e
--- a/src/utils/agents/manager.py
+++ b/src/utils/agents/manager.py
@@ -15,7 +15,7 @@ import monitor
 import requests
 class Manager() :
 	def version(self):
-		return 1.0
+		return 1.1
 	"""
 		
 		delay : <value>
@@ -29,7 +29,7 @@ class Manager() :
 	def init(self,**args) :
 		self.id		= args['node']
 		self.agents 	= args['agents']
-		self.config	= args['config']
+		self.config	= dict(args['config'])
 		self.key	= args['key']
 		self.actors	= args['actors']
 		self.update()	#-- Initializing status information
@@ -42,7 +42,6 @@ class Manager() :
 		url="https://the-phi.com/store/status/monitor"
 		r = requests.get(url,headers={"uid":self.key})
 		plans = json.loads(r.text)
-
 		meta =  [item['metadata'] for item in plans if item['status']=='active' ]
 		if len(meta) > 0 :
 			self.DELAY = 60* max([ int(item['delay']) for item in meta])
@@ -58,7 +57,7 @@ class Manager() :
 		meta = meta[0]
 		self.agents  = self.filter('agents',meta,self.agents)
 		self.actors = self.filter('actors',meta,self.actors)
-		self.setup(meta)
+		#self.setup(meta)
 
 	def filter_collectors(self,meta) :
 		"""
diff --git a/src/utils/mailer.py b/src/utils/mailer.py
old mode 100644
new mode 100755
diff --git a/src/utils/ml.py b/src/utils/ml.py
old mode 100644
new mode 100755
diff --git a/src/utils/params.py b/src/utils/params.py
old mode 100644
new mode 100755
diff --git a/src/utils/register.py b/src/utils/register.py
old mode 100644
new mode 100755
index f1336d4..68ec6c8
--- a/src/utils/register.py
+++ b/src/utils/register.py
@@ -20,7 +20,7 @@ class Register :
 		"""
 		self.class_write = args['write']
 		self.class_read	= args['read']
-		self.store_args	= args['store']	
+		self.store_args	= dict(args['store'])
 		self.default_plan = args['default']	
 		self.factory = DataSourceFactory()
 		self.uid = args['uid']
@@ -70,8 +70,8 @@ class Register :
 			
 			key = self.get_key()
 			return {"key":key,"name":plan['name'],"info":[plan['metadata']]}
-		except Exception,e:
-			print e
+		except Exception as e:
+			print (str(e))
 			return None
 	def get_key(self) :
 		store	= self.factory.instance(type=self.class_read,args=self.store_args)
@@ -106,8 +106,14 @@ class Register :
 	def get_active_plan(self):
 		store	= self.factory.instance(type=self.class_read,args=self.store_args)
 		id	= store.view('federation/uid_map',key=self.uid)
-		return	store.view('plans/active',key=id)	
+		try:	
+			r	= store.view('plans/active',key=id)	
+
+			return r
+		except Exception as e:
+			print (e)
+		return {}
 	def cancel(self,pid):
 		pass
 	def upgrade(self,pid):
-		pass
\ No newline at end of file
+		pass
diff --git a/src/utils/transport.py b/src/utils/transport.py
old mode 100644
new mode 100755