Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

log to console by default

Browse source
This commit is contained in:
jobevers 2017-01-30 12:08:32 -08:00
parent 7377158631
commit 8fc6feb316
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lbrynet/lbrynet_daemon/DaemonControl.py
View file

@ -47,14 +47,9 @@ def start():
parser.add_argument('--launch-ui', dest='launchui', action="store_true") parser.add_argument('--launch-ui', dest='launchui', action="store_true")
parser.add_argument("--http-auth", dest="useauth", action="store_true", parser.add_argument("--http-auth", dest="useauth", action="store_true",
default=conf.settings['use_auth_http']) default=conf.settings['use_auth_http'])
parser.add_argument(
'--log-to-console', dest='logtoconsole', action='store_true',
help=('Set to enable console logging. Set the --verbose flag '
' to enable more detailed console logging'))
parser.add_argument( parser.add_argument(
'--quiet', dest='quiet', action="store_true", '--quiet', dest='quiet', action="store_true",
help=('If log-to-console is not set, setting this disables all console output. ' help='Disable all console output.')
'If log-to-console is set, this argument is ignored'))
parser.add_argument( parser.add_argument(
'--verbose', nargs="*", '--verbose', nargs="*",
help=('Enable debug output. Optionally specify loggers for which debug output ' help=('Enable debug output. Optionally specify loggers for which debug output '
@ -64,42 +59,25 @@ def start():
update_settings_from_args(args) update_settings_from_args(args)
lbrynet_log = conf.settings.get_log_filename() lbrynet_log = conf.settings.get_log_filename()
log_support.configure_logging(lbrynet_log, args.logtoconsole, args.verbose) log_support.configure_logging(lbrynet_log, not args.quiet, args.verbose)
log.debug('Final Settings: %s', conf.settings.get_current_settings_dict()) log.debug('Final Settings: %s', conf.settings.get_current_settings_dict())
try: try:
log.debug('Checking for an existing lbrynet daemon instance') log.debug('Checking for an existing lbrynet daemon instance')
JSONRPCProxy.from_url(conf.settings.get_api_connection_string()).is_running() JSONRPCProxy.from_url(conf.settings.get_api_connection_string()).is_running()
log.info("lbrynet-daemon is already running") log.info("lbrynet-daemon is already running")
if not args.logtoconsole:
print "lbrynet-daemon is already running"
return return
except Exception: except Exception:
log.debug('No lbrynet instance found, continuing to start') log.debug('No lbrynet instance found, continuing to start')
pass
log.info("Starting lbrynet-daemon from command line") log.info("Starting lbrynet-daemon from command line")
if not args.logtoconsole and not args.quiet:
print "Starting lbrynet-daemon from command line"
print "To view activity, view the log file here: " + lbrynet_log
print "Web UI is available at http://%s:%i" % (
conf.settings['api_host'], conf.settings['api_port'])
print "JSONRPC API is available at " + conf.settings.get_api_connection_string()
print "To quit press ctrl-c or call 'stop' via the API"
if test_internet_connection(): if test_internet_connection():
analytics_manager = analytics.Manager.new_instance() analytics_manager = analytics.Manager.new_instance()
start_server_and_listen(args.launchui, args.useauth, analytics_manager) start_server_and_listen(args.launchui, args.useauth, analytics_manager)
reactor.run() reactor.run()
if not args.logtoconsole and not args.quiet:
print "\nClosing lbrynet-daemon"
else: else:
log.info("Not connected to internet, unable to start") log.info("Not connected to internet, unable to start")
if not args.logtoconsole:
print "Not connected to internet, unable to start"
return
def update_settings_from_args(args): def update_settings_from_args(args):