diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-22 01:33:18 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-22 01:33:18 +0000 |
commit | 759e05e676cd4a29564b6a1aee16804dbccf8c01 (patch) | |
tree | 5cd6e7808e25459e6b2216e3e722ed0235f3b889 | |
parent | 26b875f16de7cf162b08d937ea58cc5e2592085f (diff) | |
parent | 8cd83675c2ae01e53ea62876c58e03eb962faa4f (diff) | |
download | netsim-759e05e676cd4a29564b6a1aee16804dbccf8c01.tar.gz |
Snap for 9991246 from 8cd83675c2ae01e53ea62876c58e03eb962faa4f to udc-d1-release
Change-Id: Ic740784e4717eed72fdf2f817add1ee1dabe6b4b
-rw-r--r-- | rust/netsim-cxx/src/http_server/mod.rs | 12 | ||||
-rw-r--r-- | src/util/os_utils.cc | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/rust/netsim-cxx/src/http_server/mod.rs b/rust/netsim-cxx/src/http_server/mod.rs index 0347cf42..e3640ce5 100644 --- a/rust/netsim-cxx/src/http_server/mod.rs +++ b/rust/netsim-cxx/src/http_server/mod.rs @@ -44,9 +44,15 @@ use std::sync::Arc; const PATH_PREFIXES: [&str; 3] = ["js", "assets", "node_modules/tslib"]; pub fn run_http_server() { - let listener = TcpListener::bind("127.0.0.1:7681").unwrap(); + let listener = match TcpListener::bind("127.0.0.1:7681") { + Ok(listener) => listener, + Err(e) => { + eprintln!("netsimd: bind error in netsimd frontend http server. {}", e); + return; + } + }; let pool = ThreadPool::new(4); - println!("Frontend http server is listening on http://localhost:7681"); + println!("netsimd: Frontend http server is listening on http://localhost:7681"); let valid_files = Arc::new(create_filename_hash_set()); for stream in listener.incoming() { let stream = stream.unwrap(); @@ -56,7 +62,7 @@ pub fn run_http_server() { }); } - println!("Shutting down frontend http server."); + println!("netsimd: Shutting down frontend http server."); } fn ui_path(suffix: &str) -> PathBuf { diff --git a/src/util/os_utils.cc b/src/util/os_utils.cc index 21dc866f..4b8eb289 100644 --- a/src/util/os_utils.cc +++ b/src/util/os_utils.cc @@ -70,9 +70,11 @@ std::string GetDiscoveryDirectory() { } std::string GetNetsimIniFilepath() { - return GetDiscoveryDirectory() - .append(netsim::filesystem::slash) - .append("netsim.ini"); + auto discovery_dir = GetDiscoveryDirectory(); + // Check if directory has a trailing slash. + if (discovery_dir.back() != netsim::filesystem::slash.back()) + discovery_dir.append(netsim::filesystem::slash); + return discovery_dir.append("netsim.ini"); } std::optional<std::string> GetServerAddress(bool frontend_server) { |