← Back to branch summary

~verterok/ubuntuone-client/volumemanager_udfs-2

« back to all changes in this revision

Viewing changes to bin/ubuntuone-syncdaemon

  • Committer: guillermo.gonzalez at canonical
  • Date: 2010-01-04 18:54:17 UTC
  • mfrom: (294.2.6 trunk)
  • Revision ID: guillermo.gonzalez@canonical.com-20100104185417-is0onxq4znx57u0j
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubuntuone-syncdaemon
31
31
import sys
32
32
import shutil
33
33
 
34
 
from ubuntuone.syncdaemon import dbus_interface, logger
 
34
from ubuntuone.syncdaemon import dbus_interface, logger, config
35
35
from ubuntuone.syncdaemon.config import (
36
36
    get_config_files,
37
37
    get_parsers,
75
75
        configs.append(args.pop(0))
76
76
    if len(configs) == 0:
77
77
        configs.extend(get_config_files())
78
 
    (parser, options, argv) = configglue(file(configs[0]), *configs[1:], 
79
 
                               args=args, usage=usage,
80
 
                               extra_parsers=get_parsers())
 
78
    (parser, options, argv) = config.configglue(file(configs[0]), *configs[1:],
 
79
                               args=args, usage=usage)
81
80
 
82
81
    if options.debug:
83
82
        logger.set_debug('stdout file')
84
83
    else:
85
 
        logger.set_level(options.log_level)
 
84
        logger.configure_logging(options.logging_level, 
 
85
                                 options.logging_file_size,
 
86
                                 options.logging_backup_count)
86
87
 
87
88
    # check we're not running as root, or have explicitely and in
88
89
    # length expressed our desire to do so