From f3e637b67334e88f53c9c3e8bcf2a57f52cf66ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0smail=20Ba=C5=9Faran?= <basaran.ismaill@gmail.com>
Date: Thu, 25 Feb 2016 01:46:27 +0200
Subject: [PATCH] added scope instance method

---
 opt/ahenk/ahenkd.py                   | 29 +++++++++------------------
 opt/ahenk/base/Scope.py               | 12 +++++++++++
 opt/ahenk/base/logging/AhenkLogger.py |  4 ++--
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/opt/ahenk/ahenkd.py b/opt/ahenk/ahenkd.py
index 0d3c6c1..920833d 100644
--- a/opt/ahenk/ahenkd.py
+++ b/opt/ahenk/ahenkd.py
@@ -11,19 +11,11 @@ import sys,logging
 
 class AhenkDeamon(BaseDeamon):
 	"""docstring for AhenkDeamon"""
-	globalscope=None
-	def __init__(self, arg):
-		super(AhenkDeamon, self).__init__()
-		self.arg = arg
-		global globalscope
-		globalscope=Scope()
-
-	@staticmethod
-	def scope():
-		return globalscope
 
 	def run(self):
-		global globalscope
+		globalscope = Scope()
+		globalscope.setInstance(globalscope)
+
 		configFilePath='/etc/ahenk/ahenk.conf'
 		configfileFolderPath='/etc/ahenk/config.d/'
 
@@ -36,25 +28,22 @@ class AhenkDeamon(BaseDeamon):
 		logger.info("obaraaa")
 		globalscope.setLogger(logger)
 
-		
-
-
-
-
 
 if __name__ == '__main__':
 
 	pidfilePath='/var/run/ahenk.pid'
 
-	deamon = AhenkDeamon(pidfilePath)
+	ahenkdeamon = AhenkDeamon(pidfilePath)
 
+	print sys.argv
 	if len(sys.argv) == 2:
 		if sys.argv[1] == "start":
-			deamon.start()
+			print "starting"
+			ahenkdeamon.start()
 		elif sys.argv[1] == 'stop':
-			deamon.stop()
+			ahenkdeamon.stop()
 		elif sys.argv[1] == 'restart':
-			deamon.restart()
+			ahenkdeamon.restart()
 		elif sys.argv[1] == 'status':
 			# print status
 			pass
diff --git a/opt/ahenk/base/Scope.py b/opt/ahenk/base/Scope.py
index 1c64a04..d33abc5 100644
--- a/opt/ahenk/base/Scope.py
+++ b/opt/ahenk/base/Scope.py
@@ -5,12 +5,24 @@
 
 class Scope(object):
     """docstring for Scope"""
+
+    scopeInstance=None
+
     def __init__(self):
         super(Scope, self).__init__()
         self.customMap = {}
         self.configurationManager=None
         self.logger=None
 
+    @staticmethod
+    def getInstance():
+        return scopeInstance
+
+    @staticmethod
+    def setInstance(scopeObj):
+        global scopeInstance
+        scopeInstance = scopeObj
+
     def getCustomMap(self):
         return self.customMap
 
diff --git a/opt/ahenk/base/logging/AhenkLogger.py b/opt/ahenk/base/logging/AhenkLogger.py
index f130202..91a0cea 100644
--- a/opt/ahenk/base/logging/AhenkLogger.py
+++ b/opt/ahenk/base/logging/AhenkLogger.py
@@ -4,13 +4,13 @@
 
 import logging
 import logging.config
-from ahenkd import AhenkDeamon
+from base.Scope import Scope
 
 class Logger(object):
 	"""docstring for Logger"""
 	def __init__(self):
 		super(Logger, self).__init__()
-		scope = AhenkDeamon.scope()
+		scope = Scope.getInstance()
 		configManager = scope.getConfigurationManager()
 
 		logging.config.fileConfig(configManager.get('BASE','logConfigurationFilePath'))