added server-timeout config option (#215)

fixes #53

src/inmanta/agent/agent.py

@@ -207,7 +207,7 @@ class Agent(AgentEndPoint):
     """
 
     def __init__(self, io_loop, hostname=None, agent_map=None, code_loader=True, env_id=None, poolsize=1):
-        super().__init__("agent", io_loop, timeout=cfg.server_timeout)
+        super().__init__("agent", io_loop, timeout=cfg.server_timeout.get())
 
         if agent_map is None:
             agent_map = cfg.agent_map.get()
@@ -276,7 +276,7 @@ def unpause(self, name):
             return 404, "No such agent"
 
         if self._enabled[name] is not None:
-            return
+            return 200, "already running"
 
         LOGGER.info("Agent assuming primary role for %s" % name)
 
@@ -292,14 +292,14 @@ def pause(self, name):
             return 404, "No such agent"
 
         if self._enabled[name] is None:
-            return
+            return 200, "already paused"
 
         LOGGER.info("Agent lost primary role for %s" % name)
 
         token = self._enabled[name]
         self._sched.remove(token)
         self._enabled[name] = None
-        return 200
+        return 200, "paused"
 
     @protocol.handle(methods.AgentState.set_state)
     @gen.coroutine

src/inmanta/agent/config.py

@@ -62,8 +62,8 @@
            "run the agent at startup, even if a splay time is set", is_bool)
 
 server_timeout = \
-    Option("config", "server-timeout", 120,
-           "Amount of time to wait for a response from the server before we try to reconnect", is_time)
+    Option("config", "server-timeout", 125,
+           "Amount of time to wait for a response from the server before we try to reconnect, must be smaller than server.agent-hold", is_time)
 
 
 ##############################

src/inmanta/protocol.py

@@ -449,13 +449,13 @@ class RESTTransport(Transport):
     __data__ = ("message", "blob")
     __transport_name__ = "rest"
 
-    def __init__(self, endpoint):
+    def __init__(self, endpoint, connection_timout=120):
         super().__init__(endpoint)
         self.set_connected()
         self._handlers = []
         self.token = None
         self.token_lock = locks.Lock()
-        self.connection_timout = 120
+        self.connection_timout = connection_timout
 
     def _create_base_url(self, properties, msg=None):
         """
@@ -1361,7 +1361,7 @@ def __init__(self, name, sid, ioloop=None, transport=RESTTransport, timeout=120)
         self._sid = sid
 
         LOGGER.debug("Start transport for client %s", self.name)
-        tr = Transport.create(self._transport, self)
+        tr = self._transport(self, connection_timout=timeout)
         self._transport_instance = tr
 
     @gen.coroutine

src/inmanta/server/config.py

@@ -154,7 +154,7 @@ def validate_fact_renew(value):
            "The path on the local file system where the dashboard can be found")
 
 agent_timeout = \
-    Option("server", "agent-timeout", 2,
+    Option("server", "agent-timeout", 30,
            "Time before an agent is considered to be offline", is_time)