diff --git a/.gitignore b/.gitignore index b47a46d..7c3ea6f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.py[cod] debian/ahenk/* debian/ahenk +*.orig diff --git a/opt/ahenk/ahenkd.py b/opt/ahenk/ahenkd.py index 8ef51ea..e150853 100644 --- a/opt/ahenk/ahenkd.py +++ b/opt/ahenk/ahenkd.py @@ -1,10 +1,10 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- # Author: İsmail BAŞARAN from base.config.ConfigManager import ConfigManager from base.deamon.BaseDeamon import BaseDeamon -from base.logger.AhenkLogger import AhenkLogger +from base.logging.AhenkLogger import Logger from base.Scope import Scope #from base.messaging.Messaging import Messaging import sys,logging @@ -12,19 +12,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/' @@ -33,29 +25,26 @@ class AhenkDeamon(BaseDeamon): config = configManager.read() globalscope.setConfigurationManager(config) - #logger = AhenkLogger() - #logger.info("obaraaa") - #globalscope.setLogger(logger) - - #messaging=Messaging() - #messaging.connectToServer() + logger = Logger() + logger.info("obaraaa") + globalscope.setLogger(logger) if __name__ == '__main__': - print "hello" - print sys.path -""" + 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 @@ -66,4 +55,3 @@ if __name__ == '__main__': else: print 'Usage : %s start|stop|restart|status' % sys.argv[0] sys.exit(2) -""" 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 58dcc30..a37e0c9 100644 --- a/opt/ahenk/base/logging/AhenkLogger.py +++ b/opt/ahenk/base/logging/AhenkLogger.py @@ -5,13 +5,13 @@ import sys sys.path.append('../..') import logging import logging.config -from ahenkd import AhenkDeamon +from base.Scope import Scope class AhenkLogger(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'))