diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2018-10-12 21:11:17 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-10-16 20:15:10 +0300 |
| commit | 7729513460a448df44993c2e3a1b6f4b605d19af (patch) | |
| tree | 1f158f192539336785d2a3c1fb17597cd30c9773 /src | |
| parent | f254ba77a5abf5a806efb35055b5e0d4ced40251 (diff) | |
| download | bmcweb-7729513460a448df44993c2e3a1b6f4b605d19af.tar.xz | |
Fix merge conflict, and enable SOL
A merge conflict caused the SOL websocket code to get removed from
master. This resolves the merge conflict, and reenables SOL in bmcweb.
Tested By: Launched SOL console in phosphor-webui, and observed
appropriate behavior.
Change-Id: I88116fdfb488b6c41aa859e4904b38e918111d04
Diffstat (limited to 'src')
| -rw-r--r-- | src/webserver_main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp index 051b1fed61..d141841690 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp @@ -7,6 +7,7 @@ #include <dbus_singleton.hpp> #include <image_upload.hpp> #include <memory> +#include <obmc_console.hpp> #include <openbmc_dbus_rest.hpp> #include <persistent_data_middleware.hpp> #include <redfish.hpp> @@ -90,6 +91,10 @@ int main(int argc, char** argv) crow::openbmc_mapper::requestRoutes(app); #endif +#ifdef BMCWEB_ENABLE_HOST_SERIAL_WEBSOCKET + crow::obmc_console::requestRoutes(app); +#endif + crow::token_authorization::requestRoutes(app); BMCWEB_LOG_INFO << "bmcweb (" << __DATE__ << ": " << __TIME__ << ')'; |