Issue/564 transport cleanup

src/inmanta/app.py

@@ -34,23 +34,23 @@
 from inmanta.export import cfg_env, ModelExporter
 from inmanta.ast import CompilerException
 import yaml
+from inmanta.server.bootloader import InmantaBootloader
 
 LOGGER = logging.getLogger()
 
 
 @command("server", help_msg="Start the inmanta server")
 def start_server(options):
-    from inmanta import server
     io_loop = IOLoop.current()
 
-    s = server.Server(io_loop)
-    s.start()
+    ibl = InmantaBootloader()
+    ibl.start()
 
     try:
         io_loop.start()
     except KeyboardInterrupt:
         IOLoop.current().stop()
-        s.stop()
+        ibl.stop()
 
 
 @command("agent", help_msg="Start the inmanta agent")

src/inmanta/deploy.py

@@ -111,6 +111,7 @@ def setup_server(self, no_agent_log):
         args = [sys.executable, "-m", "inmanta.app", "-vvv", "-c", server_config, "server"]
 
         self._server_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
         LOGGER.debug("Started server on port %d", self._server_port)
 
         while self._server_proc.poll() is None: