Revision 888355d1 logic/dispatcher.py
b/logic/dispatcher.py | ||
---|---|---|
44 | 44 |
path = os.path.normpath(os.path.join(os.getcwd(), '..')) |
45 | 45 |
sys.path.append(path) |
46 | 46 |
import synnefo.settings as settings |
47 |
from synnefo.logic import log |
|
47 | 48 |
|
48 | 49 |
setup_environ(settings) |
49 | 50 |
|
50 | 51 |
from amqplib import client_0_8 as amqp |
51 | 52 |
from signal import signal, SIGINT, SIGTERM |
52 | 53 |
|
53 |
import logging |
|
54 |
import logging.config |
|
55 | 54 |
import time |
56 | 55 |
import socket |
57 | 56 |
from daemon import pidfile, daemon |
58 |
import lockfile.pidlockfile |
|
59 | 57 |
|
60 | 58 |
from synnefo.logic import callbacks |
61 | 59 |
|
62 |
|
|
63 | 60 |
class Dispatcher: |
64 | 61 |
|
65 | 62 |
logger = None |
... | ... | |
68 | 65 |
clienttags = [] |
69 | 66 |
|
70 | 67 |
def __init__(self, debug = False): |
68 |
|
|
71 | 69 |
# Initialize logger |
72 |
logging.config.fileConfig("/Volumes/Files/Developer/grnet/synnefo/logging.conf") |
|
73 |
self.logger = logging.getLogger("synnefo.dispatcher") |
|
70 |
self.logger = log.get_logger('synnefo.dispatcher') |
|
74 | 71 |
|
75 | 72 |
self.debug = debug |
76 | 73 |
self._init() |
... | ... | |
231 | 228 |
global children, logger |
232 | 229 |
(opts, args) = parse_arguments(sys.argv[1:]) |
233 | 230 |
|
234 |
# Initialize logger |
|
235 |
logging.config.fileConfig("logging.conf") |
|
236 |
logger = logging.getLogger("synnefo.dispatcher") |
|
231 |
logger = log.get_logger("synnefo.dispatcher") |
|
237 | 232 |
|
238 | 233 |
# Special case for the clean up queues action |
239 | 234 |
if opts.cleanup_queues: |
... | ... | |
292 | 287 |
pidf.release() |
293 | 288 |
|
294 | 289 |
if __name__ == "__main__": |
295 |
logging.basicConfig(level=logging.DEBUG) |
|
296 | 290 |
sys.exit(main()) |
297 | 291 |
|
298 | 292 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
Also available in: Unified diff