From 45ca493ecf94af1d419db090709d040a767b91e4 Mon Sep 17 00:00:00 2001
From: Jeremy <grossmj@gns3.net>
Date: Mon, 2 Feb 2015 14:52:58 -0700
Subject: [PATCH] Use module settings from the config file.

---
 gns3server/main.py                        |  4 +---
 gns3server/modules/port_manager.py        |  3 +++
 gns3server/modules/virtualbox/__init__.py | 16 +++-------------
 gns3server/modules/vpcs/vpcs_vm.py        |  4 +---
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/gns3server/main.py b/gns3server/main.py
index cd9689f3..59ca9010 100644
--- a/gns3server/main.py
+++ b/gns3server/main.py
@@ -112,15 +112,13 @@ def main():
     args = parse_arguments()
     if args.debug:
         level = logging.DEBUG
-    user_log = init_logger(level, quiet=args.quiet)
 
-    user_log = init_logger(logging.INFO)
+    user_log = init_logger(level, quiet=args.quiet)
     user_log.info("GNS3 server version {}".format(__version__))
     current_year = datetime.date.today().year
     user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year))
 
     set_config(args)
-
     server_config = Config.instance().get_section_config("Server")
     if server_config.getboolean("local"):
         log.warning("Local mode is enabled. Beware, clients will have full control on your filesystem")
diff --git a/gns3server/modules/port_manager.py b/gns3server/modules/port_manager.py
index 514d07ce..80e94087 100644
--- a/gns3server/modules/port_manager.py
+++ b/gns3server/modules/port_manager.py
@@ -44,9 +44,12 @@ class PortManager:
         console_start_port_range = server_config.getint("console_start_port_range", 2000)
         console_end_port_range = server_config.getint("console_end_port_range", 5000)
         self._console_port_range = (console_start_port_range, console_end_port_range)
+        log.debug("Console port range is {}-{}".format(console_start_port_range, console_end_port_range))
+
         udp_start_port_range = server_config.getint("udp_start_port_range", 10000)
         udp_end_port_range = server_config.getint("udp_end_port_range", 20000)
         self._udp_port_range = (udp_start_port_range, udp_end_port_range)
+        log.debug("UDP port range is {}-{}".format(udp_start_port_range, udp_end_port_range))
 
         if remote_console_connections:
             log.warning("Remote console connections are allowed")
diff --git a/gns3server/modules/virtualbox/__init__.py b/gns3server/modules/virtualbox/__init__.py
index 152d72e2..f478e077 100644
--- a/gns3server/modules/virtualbox/__init__.py
+++ b/gns3server/modules/virtualbox/__init__.py
@@ -38,7 +38,6 @@ class VirtualBox(BaseManager):
 
         super().__init__()
         self._vboxmanage_path = None
-        self._vbox_user = None
 
     @property
     def vboxmanage_path(self):
@@ -50,16 +49,6 @@ class VirtualBox(BaseManager):
 
         return self._vboxmanage_path
 
-    @property
-    def vbox_user(self):
-        """
-        Returns the VirtualBox user
-
-        :returns: username
-        """
-
-        return self._vbox_user
-
     def find_vboxmanage(self):
 
         # look for VBoxManage
@@ -94,9 +83,10 @@ class VirtualBox(BaseManager):
         command = [vboxmanage_path, "--nologo", subcommand]
         command.extend(args)
         try:
-            if self.vbox_user:
+            vbox_user = self.config.get_section_config("VirtualBox").get("vbox_user")
+            if vbox_user:
                 # TODO: test & review this part
-                sudo_command = "sudo -i -u {}".format(self.vbox_user) + " ".join(command)
+                sudo_command = "sudo -i -u {}".format(vbox_user) + " ".join(command)
                 process = yield from asyncio.create_subprocess_shell(sudo_command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
             else:
                 process = yield from asyncio.create_subprocess_exec(*command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
diff --git a/gns3server/modules/vpcs/vpcs_vm.py b/gns3server/modules/vpcs/vpcs_vm.py
index e5f5ed28..73dac3d1 100644
--- a/gns3server/modules/vpcs/vpcs_vm.py
+++ b/gns3server/modules/vpcs/vpcs_vm.py
@@ -57,10 +57,8 @@ class VPCSVM(BaseVM):
 
         super().__init__(name, uuid, project, manager)
 
-        self._path = manager.config.get_section_config("VPCS").get("path", "vpcs")
-
+        self._path = manager.config.get_section_config("VPCS").get("vpcs_path", "vpcs")
         self._console = console
-
         self._command = []
         self._process = None
         self._vpcs_stdout_file = ""