← Back to branch summary

~crossbar/crossbar/trunk

« back to all changes in this revision

Viewing changes to crossbar/controller/cli.py

  • Committer: GitHub
  • Author(s): Tobias Oberstein
  • Date: 2016-09-15 08:25:18 UTC
  • mfrom: (1151.2.1)
  • Revision ID: git-v1:99665fccb1852d50feeea958cfaaf0fc51289ad4
Merge pull request #865 from meejah/logging-audit

convert all log calls using .format() to use kwargs

Show diffs side-by-side

added added

removed removed

Lines of Context:
crossbar/controller/cli.py
184
184
                                nicecmdline = ' '.join(cmdline)
185
185
                                if len(nicecmdline) > 76:
186
186
                                    nicecmdline = nicecmdline[:38] + ' ... ' + nicecmdline[-38:]
187
 
                                log.info('"{}" points to PID {} which is not a crossbar process:'.format(fp, pid))
188
 
                                log.info('  ' + nicecmdline)
189
 
                                log.info('Verify manually and either kill {} or delete {}'.format(pid, fp))
 
187
                                log.info('"{fp}" points to PID {pid} which is not a crossbar process:', fp=fp, pid=pid)
 
188
                                log.info('  {cmdline}', cmdline=nicecmdline)
 
189
                                log.info('Verify manually and either kill {pid} or delete {fp}', pid=pid, fp=fp)
190
190
                                return None
191
191
                        return pid_data
192
192
                    else:
392
392
    log.info("Application template initialized")
393
393
 
394
394
    if get_started_hint:
395
 
        log.info("\n{}\n".format(get_started_hint))
 
395
        log.info("\n{hint}\n", hint=get_started_hint)
396
396
    else:
397
397
        log.info("\nTo start your node, run 'crossbar start --cbdir {cbdir}'\n",
398
398
                 cbdir=os.path.abspath(os.path.join(options.appdir, '.crossbar')))
633
633
 
634
634
        def on_error(err):
635
635
            log.error("{e!s}", e=err.value)
636
 
            log.error("Could not start node: {err}".format(err))
 
636
            log.error("Could not start node: {err}", err=err)
637
637
            if reactor.running:
638
638
                reactor.stop()
639
639
        d.addErrback(on_error)
1002
1002
                try:
1003
1003
                    os.mkdir(options.logdir)
1004
1004
                except Exception as e:
1005
 
                    print("Could not create log directory: {}".format(e))
 
1005
                    print("Could not create log directory: {e}".format(e))
1006
1006
                    sys.exit(1)
1007
1007
 
1008
1008
    if not reactor: