ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-20 05:17:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds debug and quiet command line args.

Browse Source
This commit is contained in:
Jeremy 2015-01-23 13:10:57 -07:00
parent 39e3ca91a9
commit 6e7a5ca8bd
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gns3server/main.py
View File

@ -51,23 +51,23 @@ def locale_check():
try: try:
language, encoding = locale.getlocale() language, encoding = locale.getlocale()
except ValueError as e: except ValueError as e:
log.error("could not determine the current locale: {}".format(e)) log.error("Could not determine the current locale: {}".format(e))
if not language and not encoding: if not language and not encoding:
try: try:
log.warn("could not find a default locale, switching to C.UTF-8...") log.warn("Could not find a default locale, switching to C.UTF-8...")
locale.setlocale(locale.LC_ALL, ("C", "UTF-8")) locale.setlocale(locale.LC_ALL, ("C", "UTF-8"))
except locale.Error as e: except locale.Error as e:
log.error("could not switch to the C.UTF-8 locale: {}".format(e)) log.error("Could not switch to the C.UTF-8 locale: {}".format(e))
raise SystemExit raise SystemExit
elif encoding != "UTF-8": elif encoding != "UTF-8":
log.warn("your locale {}.{} encoding is not UTF-8, switching to the UTF-8 version...".format(language, encoding)) log.warn("Your locale {}.{} encoding is not UTF-8, switching to the UTF-8 version...".format(language, encoding))
try: try:
locale.setlocale(locale.LC_ALL, (language, "UTF-8")) locale.setlocale(locale.LC_ALL, (language, "UTF-8"))
except locale.Error as e: except locale.Error as e:
log.error("could not set an UTF-8 encoding for the {} locale: {}".format(language, e)) log.error("Could not set an UTF-8 encoding for the {} locale: {}".format(language, e))
raise SystemExit raise SystemExit
else: else:
log.info("current locale is {}.{}".format(language, encoding)) log.info("Current locale is {}.{}".format(language, encoding))
def parse_arguments(): def parse_arguments():
@ -76,7 +76,10 @@ def parse_arguments():
parser.add_argument("-l", "--host", help="run on the given host/IP address", default="127.0.0.1", nargs="?") parser.add_argument("-l", "--host", help="run on the given host/IP address", default="127.0.0.1", nargs="?")
parser.add_argument("-p", "--port", type=int, help="run on the given port", default=8000, nargs="?") parser.add_argument("-p", "--port", type=int, help="run on the given port", default=8000, nargs="?")
parser.add_argument("-v", "--version", help="show the version", action="version", version=__version__) parser.add_argument("-v", "--version", help="show the version", action="version", version=__version__)
parser.add_argument("-q", "--quiet", action="store_true", help="Do not show logs on stdout")
parser.add_argument("-d", "--debug", action="store_true", help="Show debug logs")
parser.add_argument("-L", "--local", action="store_true", help="Local mode (allow some insecure operations)") parser.add_argument("-L", "--local", action="store_true", help="Local mode (allow some insecure operations)")
parser.add_argument("-A", "--allow-remote-console", dest="allow", action="store_true", help="Allow remote connections to console ports") parser.add_argument("-A", "--allow-remote-console", dest="allow", action="store_true", help="Allow remote connections to console ports")
args = parser.parse_args() args = parser.parse_args()
@ -97,27 +100,19 @@ def parse_arguments():
server_config["port"] = str(args.port) server_config["port"] = str(args.port)
config.set_section_config("Server", server_config) config.set_section_config("Server", server_config)
return args
def main(): def main():
""" """
Entry point for GNS3 server Entry point for GNS3 server
""" """
# TODO: migrate command line options to argparse (don't forget the quiet mode).
current_year = datetime.date.today().year current_year = datetime.date.today().year
# TODO: Renable the test when we will have command line args = parse_arguments()
# user_log = logging.getLogger('user_facing') level = logging.INFO
# if not options.quiet: if args.debug:
# # Send user facing messages to stdout. level = logging.DEBUG
# stream_handler = logging.StreamHandler(sys.stdout) user_log = init_logger(level, quiet=args.quiet)
# stream_handler.addFilter(logging.Filter(name='user_facing'))
# user_log.addHandler(stream_handler)
# user_log.propagate = False
# END OLD LOG CODE
user_log = init_logger(logging.DEBUG, quiet=False)
parse_arguments()
user_log.info("GNS3 server version {}".format(__version__)) user_log.info("GNS3 server version {}".format(__version__))
user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year)) user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year))