Commit 5ec35e37 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

Merge branch 'trac3227'

parents fc1a10ef 1a6565ad
...@@ -40,6 +40,7 @@ import csv ...@@ -40,6 +40,7 @@ import csv
import random import random
import time import time
import signal import signal
import errno
from isc.config import ccsession from isc.config import ccsession
import isc.cc.proto_defs import isc.cc.proto_defs
import isc.util.process import isc.util.process
...@@ -523,7 +524,17 @@ class SecureHTTPServer(socketserver_mixin.NoPollMixIn, ...@@ -523,7 +524,17 @@ class SecureHTTPServer(socketserver_mixin.NoPollMixIn,
logger.debug(DBG_CMDCTL_MESSAGING, CMDCTL_STARTED, logger.debug(DBG_CMDCTL_MESSAGING, CMDCTL_STARTED,
server_address[0], server_address[1]) server_address[0], server_address[1])
except socket.error as err: except socket.error as err:
raise CmdctlException("Error creating server, because: %s \n" % str(err)) if err.errno == errno.EADDRINUSE:
raise CmdctlException(("Error creating server, because " +\
"port %d on address %s is " +\
"already in use. Please stop " +\
"the application that uses it or " +\
"see the guide about using a " +\
"different port for b10-cmdctl.") % \
(server_address[1], \
server_address[0]))
else:
raise CmdctlException("Error creating server, because: %s" % str(err))
self.user_sessions = {} self.user_sessions = {}
self.idle_timeout = idle_timeout self.idle_timeout = idle_timeout
......
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