diff --git a/spectrum_manager/src/main.cpp b/spectrum_manager/src/main.cpp index ac816e20..233f55b3 100644 --- a/spectrum_manager/src/main.cpp +++ b/spectrum_manager/src/main.cpp @@ -139,7 +139,7 @@ int main(int argc, char **argv) } else if (command[0] == "server") { Server server(&config); - server.start(8080); + server.start(); while (1) { sleep(10); } } else { diff --git a/spectrum_manager/src/managerconfig.cpp b/spectrum_manager/src/managerconfig.cpp index 807bab8b..b3c159c4 100644 --- a/spectrum_manager/src/managerconfig.cpp +++ b/spectrum_manager/src/managerconfig.cpp @@ -31,6 +31,7 @@ bool ManagerConfig::load(const std::string &configfile, boost::program_options:: opts.add_options() ("service.admin_username", value()->default_value(""), "Administrator username.") ("service.admin_password", value()->default_value(""), "Administrator password.") + ("service.port", value()->default_value(8081), "Web interface port.") ("service.config_directory", value()->default_value("/etc/spectrum2/transports/"), "Directory with spectrum2 configuration files. One .cfg file per one instance") ("servers.server", value >()->multitoken(), "Server.") ; diff --git a/spectrum_manager/src/server.cpp b/spectrum_manager/src/server.cpp index 0bde682b..cc86e927 100644 --- a/spectrum_manager/src/server.cpp +++ b/spectrum_manager/src/server.cpp @@ -158,9 +158,9 @@ static void *_event_handler(enum mg_event event, struct mg_connection *conn) { return static_cast(request_info->user_data)->event_handler(event, conn); } -bool Server::start(int port) { +bool Server::start() { const char *options[] = { - "listening_ports", boost::lexical_cast(port).c_str(), + "listening_ports", boost::lexical_cast(CONFIG_INT(m_config, "service.port")).c_str(), "num_threads", "1", NULL }; @@ -296,7 +296,7 @@ void Server::serve_login(struct mg_connection *conn, const struct mg_request_inf
\
\ Username:
\ - Password:
\ + Password:
\ \
\ \ diff --git a/spectrum_manager/src/server.h b/spectrum_manager/src/server.h index 94c42da5..4d202040 100644 --- a/spectrum_manager/src/server.h +++ b/spectrum_manager/src/server.h @@ -46,7 +46,7 @@ class Server { /// Destructor virtual ~Server(); - bool start(int port); + bool start(); void *event_handler(enum mg_event event, struct mg_connection *conn);