Revision 57fd6d0b
b/lib/cmdlib.py | ||
---|---|---|
6074 | 6074 |
else: |
6075 | 6075 |
network_port = None |
6076 | 6076 |
|
6077 |
##if self.op.vnc_bind_address is None: |
|
6078 |
## self.op.vnc_bind_address = constants.VNC_DEFAULT_BIND_ADDRESS |
|
6079 |
|
|
6080 | 6077 |
# this is needed because os.path.join does not accept None arguments |
6081 | 6078 |
if self.op.file_storage_dir is None: |
6082 | 6079 |
string_file_storage_dir = "" |
b/lib/constants.py | ||
---|---|---|
124 | 124 |
# daemon-name: (default-cert-path, default-key-path) |
125 | 125 |
NODED: (SSL_CERT_FILE, SSL_CERT_FILE), |
126 | 126 |
RAPI: (RAPI_CERT_FILE, RAPI_CERT_FILE), |
127 |
} |
|
127 |
}
|
|
128 | 128 |
|
129 | 129 |
DAEMONS_PORTS = { |
130 | 130 |
# daemon-name: ("proto", "default-port") |
131 | 131 |
NODED: ("tcp", 1811), |
132 | 132 |
CONFD: ("udp", 1814), |
133 | 133 |
RAPI: ("tcp", 5080), |
134 |
} |
|
134 |
} |
|
135 |
|
|
135 | 136 |
DEFAULT_NODED_PORT = DAEMONS_PORTS[NODED][1] |
136 | 137 |
DEFAULT_CONFD_PORT = DAEMONS_PORTS[CONFD][1] |
137 | 138 |
DEFAULT_RAPI_PORT = DAEMONS_PORTS[RAPI][1] |
... | ... | |
148 | 149 |
RAPI: LOG_DIR + "rapi-daemon.log", |
149 | 150 |
MASTERD: LOG_DIR + "master-daemon.log", |
150 | 151 |
} |
152 |
|
|
151 | 153 |
LOG_OS_DIR = LOG_DIR + "os" |
152 | 154 |
LOG_WATCHER = LOG_DIR + "watcher.log" |
153 | 155 |
LOG_COMMANDS = LOG_DIR + "commands.log" |
b/lib/http/server.py | ||
---|---|---|
416 | 416 |
""" |
417 | 417 |
return self.error_message_format % values |
418 | 418 |
|
419 |
|
|
419 | 420 |
class HttpServer(http.HttpBase, asyncore.dispatcher): |
420 | 421 |
"""Generic HTTP server class |
421 | 422 |
|
Also available in: Unified diff