Revision 3b316acb
| b/daemons/ganeti-masterd | ||
|---|---|---|
| 397 | 397 |
utils.debug = options.debug |
| 398 | 398 |
utils.no_fork = True |
| 399 | 399 |
|
| 400 |
logger.SetupLogging(program="ganeti-masterd", debug=options.debug) |
|
| 401 |
|
|
| 402 | 400 |
CheckMaster(options.debug) |
| 403 | 401 |
|
| 404 | 402 |
master = IOServer(constants.MASTER_SOCKET, ClientRqHandler, GanetiContext()) |
| ... | ... | |
| 408 | 406 |
utils.Daemonize(logfile=constants.LOG_MASTERDAEMON, |
| 409 | 407 |
noclose_fds=[master.fileno()]) |
| 410 | 408 |
|
| 409 |
logger.SetupDaemon(constants.LOG_MASTERDAEMON, debug=options.debug) |
|
| 410 |
|
|
| 411 |
logger.Info("ganeti master daemon startup")
|
|
| 412 |
|
|
| 411 | 413 |
try: |
| 412 | 414 |
utils.Lock('cmd', debug=options.debug)
|
| 413 | 415 |
except errors.LockError, err: |
| b/daemons/ganeti-watcher | ||
|---|---|---|
| 41 | 41 |
from ganeti import serializer |
| 42 | 42 |
from ganeti import ssconf |
| 43 | 43 |
from ganeti import errors |
| 44 |
from ganeti import logger |
|
| 44 | 45 |
|
| 45 | 46 |
|
| 46 | 47 |
MAXTRIES = 5 |
| ... | ... | |
| 443 | 444 |
return options, args |
| 444 | 445 |
|
| 445 | 446 |
|
| 446 |
def SetupLogging(debug): |
|
| 447 |
"""Configures the logging module. |
|
| 448 |
|
|
| 449 |
""" |
|
| 450 |
formatter = logging.Formatter("%(asctime)s: %(message)s")
|
|
| 451 |
|
|
| 452 |
logfile_handler = logging.FileHandler(constants.LOG_WATCHER) |
|
| 453 |
logfile_handler.setFormatter(formatter) |
|
| 454 |
logfile_handler.setLevel(logging.INFO) |
|
| 455 |
|
|
| 456 |
stderr_handler = logging.StreamHandler() |
|
| 457 |
stderr_handler.setFormatter(formatter) |
|
| 458 |
if debug: |
|
| 459 |
stderr_handler.setLevel(logging.NOTSET) |
|
| 460 |
else: |
|
| 461 |
stderr_handler.setLevel(logging.CRITICAL) |
|
| 462 |
|
|
| 463 |
root_logger = logging.getLogger("")
|
|
| 464 |
root_logger.setLevel(logging.NOTSET) |
|
| 465 |
root_logger.addHandler(logfile_handler) |
|
| 466 |
root_logger.addHandler(stderr_handler) |
|
| 467 |
|
|
| 468 |
|
|
| 469 | 447 |
def main(): |
| 470 | 448 |
"""Main function. |
| 471 | 449 |
|
| 472 | 450 |
""" |
| 473 | 451 |
options, args = ParseOptions() |
| 474 | 452 |
|
| 475 |
SetupLogging(options.debug)
|
|
| 453 |
logger.SetupDaemon(constants.LOG_WATCHER, debug=options.debug)
|
|
| 476 | 454 |
|
| 477 | 455 |
try: |
| 478 | 456 |
try: |
| b/lib/logger.py | ||
|---|---|---|
| 84 | 84 |
root_logger.addHandler(stderr_file) |
| 85 | 85 |
|
| 86 | 86 |
|
| 87 |
def SetupDaemon(logfile, debug=False): |
|
| 88 |
"""Configures the logging module for daemons |
|
| 89 |
|
|
| 90 |
""" |
|
| 91 |
if debug: |
|
| 92 |
fmt = "%(asctime)s: %(levelname)s %(pathname)s:%(lineno)s %(message)s" |
|
| 93 |
else: |
|
| 94 |
fmt = "%(asctime)s: %(levelname)s %(message)s" |
|
| 95 |
formatter = logging.Formatter(fmt) |
|
| 96 |
|
|
| 97 |
logfile_handler = logging.FileHandler(logfile) |
|
| 98 |
logfile_handler.setFormatter(formatter) |
|
| 99 |
|
|
| 100 |
stderr_handler = logging.StreamHandler() |
|
| 101 |
stderr_handler.setFormatter(formatter) |
|
| 102 |
if debug: |
|
| 103 |
logfile_handler.setLevel(logging.DEBUG) |
|
| 104 |
stderr_handler.setLevel(logging.NOTSET) |
|
| 105 |
else: |
|
| 106 |
logfile_handler.setLevel(logging.INFO) |
|
| 107 |
stderr_handler.setLevel(logging.CRITICAL) |
|
| 108 |
|
|
| 109 |
root_logger = logging.getLogger("")
|
|
| 110 |
root_logger.setLevel(logging.NOTSET) |
|
| 111 |
root_logger.addHandler(logfile_handler) |
|
| 112 |
root_logger.addHandler(stderr_handler) |
|
| 113 |
|
|
| 114 |
|
|
| 87 | 115 |
# Backwards compatibility |
| 88 | 116 |
Error = logging.error |
| 89 | 117 |
Info = logging.info |
Also available in: Unified diff