← Back to branch summary

~paul-stanley/endroid/muc-fixes

« back to all changes in this revision

Viewing changes to src/endroid/__init__.py

  • Committer: Tarmac
  • Author(s): Chris Davidson, Chris Davidson
  • Date: 2014-09-10 14:01:01 UTC
  • mfrom: (77.16.19 end-bug-mu)
  • Revision ID: tarmac-20140910140101-36ekmk6vun5u1fa6
SMS plugin fixes, config file cleanup and other assorted cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/endroid/__init__.py
33
33
 
34
34
__version__ = (1, 2)
35
35
 
36
 
LOGGING_FORMAT = '%(asctime)-8s %(levelname)-8s %(message)s'
 
36
LOGGING_FORMAT = '%(asctime)-8s %(name)-20s %(levelname)-8s %(message)s'
37
37
LOGGING_DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
38
38
# LOGGING_FORMAT = '%(levelname)-5s: %(message)s'
39
39
 
44
44
 
45
45
        self.conf = Parser(conffile)
46
46
 
47
 
        logfile = self.conf.get("setup", "logfile",
48
 
                                default=args.logfile)
49
 
        observer = log.PythonLoggingObserver()
50
 
        observer.start()
 
47
        if args.logfile:
 
48
            # CLI should take precendece over config
 
49
            logfile = args.logfile
 
50
        else:
 
51
            logfile = self.conf.get("setup", "logfile",
 
52
                                    default="")
 
53
 
 
54
        if args.logtwisted:
 
55
            observer = log.PythonLoggingObserver()
 
56
            observer.start()
51
57
 
52
58
        if logfile:
53
59
            logfile = os.path.expanduser(logfile)
58
64
            console.setLevel(args.level)
59
65
            console.setFormatter(logging.Formatter(LOGGING_FORMAT, "%H:%M:%S"))
60
66
            logging.getLogger().addHandler(console)
 
67
            logging.info("Logging to STDOUT and {}".format(logfile))
61
68
        else:
62
69
            logging.basicConfig(level=args.level, format=LOGGING_FORMAT,
63
70
                                datefmt=LOGGING_DATE_FORMAT)
 
71
            logging.info("Logging to STDOUT")
64
72
 
65
73
        self.jid = self.conf.get("setup", "jid")
66
74
        logging.info("Found JID: " + self.jid)
190
198
                        help="File for logging output.")
191
199
    parser.add_argument("-t", "--logtraffic", action='store_true',
192
200
                        help="Additionally log all traffic.")
 
201
    parser.add_argument("-w", "--logtwisted", action='store_true',
 
202
                        help="Additionally include twisted logging.")
193
203
    parser.add_argument("-m", "--manhole", const=True, nargs='?', 
194
204
                        metavar="user@host:port", 
195
205
                        help="Login name, host and port for ssh access. "