To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit c514315b authored by Reto Da Forno's avatar Reto Da Forno

bugfix in serialproxy (only one connection allowed at a time, existing...

bugfix in serialproxy (only one connection allowed at a time, existing connection will not be terminated if another connection is initiated by the user)
parent 8db2e7b4
......@@ -133,7 +133,7 @@ def obs_connect_process(conreqQueue, condoneQueue, _stopevent):
condoneQueue.put((forking_dumps(sock), w))
worklist.remove(w)
except:
#logger.info("Could not connect to observer %s on port %d, will retry later.." % (w[0],w[1]))
logger.info("Could not connect to observer %s on port %d, will retry later.." % (w[0],w[1]))
pass
### END obs_connect_process
......@@ -308,10 +308,13 @@ class ProxyConnections():
src_list, dst_list, src_to_dst, dst_to_src = self.getLists(is_observer)
connectionConfig = connectionConfig[0]
if addr in src_list:
src_list[addr].shutdown()
src_list[addr].close()
self.removelist.append(src_list[addr])
logger.info("closed already existing connection to %s %d after reconnect." % (addr[0], addr[1]))
#src_list[addr].shutdown(socket.SHUT_RDWR)
#src_list[addr].close()
#self.removelist.append(src_list[addr])
#logger.info("closed already existing connection to %s %d after reconnect." % (addr[0], addr[1]))
conn.close()
logger.info("connection rejected, already exists")
return
src_list[addr] = conn
#logger.debug("src_list is %s" % str(src_list))
if connectionConfig in dst_list:
......@@ -389,7 +392,7 @@ class ProxyConnections():
m = ''
try:
m = i.recv(1024)
logger.debug("received %d bytes from socket %s" % (len(m), str(i)))
#logger.debug("received %d bytes from socket %s" % (len(m), str(i)))
except socket_error as serr:
# user probably disconnected, don't generate an error message
break
......
......@@ -137,7 +137,7 @@
<tr><td><b>Tests</b></td></tr>
<tr><td>Total number of tests since 2012: </td><td class="numberField"><?php echo $stats['num_tests']; ?></td></td></tr>
<tr><td>Average test duration [min]: </td><td class="numberField"><?php echo (string)round(intval($stats['avg_runtime']) / 60); ?></td></td></tr>
<tr><td>Average time overhead per test [s]: </td><td class="numberField"><?php echo (string)(intval($stats['avg_setup_time']) + intval($stats['avg_cleanup_time'])); ?></td></td></tr>
<tr><td>Average setup + cleanup time overhead per test [s]: </td><td class="numberField"><?php echo (string)(intval($stats['avg_setup_time']) + intval($stats['avg_cleanup_time'])); ?></td></td></tr>
<tr><td></td></tr>
<tr><td><b>Used platforms</b></td></tr>
<tr><td>Number of tests on the TmoteSky (TelosB) platform: </td><td class="numberField"><?php echo $stats['tmote_tests']; ?></td></td><td class="numberField"><?php print_tests_percent($stats['tmote_tests']); ?></td></tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment