Move some error logs to warnings (#385)

* Move some error logs to warnings * move env inside sudo
MisterTea · Feb 3, 2021 · d12f234 · d12f234
1 parent 5cfa137
commit d12f234
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -16,8 +16,8 @@ jobs:
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
           sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get -y upgrade
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y upgrade
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git submodule update --init --force --recursive
@@ -43,8 +43,8 @@ jobs:
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
           sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get -y upgrade
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y upgrade
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git submodule update --init --force --recursive
@@ -70,8 +70,8 @@ jobs:
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
           sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get -y upgrade
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y upgrade
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git submodule update --init --force --recursive
@@ -97,8 +97,8 @@ jobs:
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
           sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
-          DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y sudo apt-get -y upgrade
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y libssl-dev libcurl4-openssl-dev libunwind-dev git cmake gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
+          sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y upgrade
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git submodule update --init --force --recursive

diff --git a/src/base/TcpSocketHandler.cpp b/src/base/TcpSocketHandler.cpp
@@ -196,9 +196,9 @@ set<int> TcpSocketHandler::listen(const SocketEndpoint &endpoint) {
     if (::bind(sockFd, p->ai_addr, p->ai_addrlen) == -1) {
       // This most often happens because the port is in use.
       auto localErrno = errno;
-      LOG(ERROR) << "Error binding " << p->ai_family << "/" << p->ai_socktype
-                 << "/" << p->ai_protocol << ": " << localErrno << " "
-                 << strerror(localErrno);
+      LOG(WARNING) << "Error binding " << p->ai_family << "/" << p->ai_socktype
+                   << "/" << p->ai_protocol << ": " << localErrno << " "
+                   << strerror(localErrno);
       CLOG(INFO, "stdout") << "Error binding " << p->ai_family << "/"
                            << p->ai_socktype << "/" << p->ai_protocol << ": "
                            << localErrno << " " << strerror(localErrno) << endl;

diff --git a/src/terminal/UserJumphostHandler.cpp b/src/terminal/UserJumphostHandler.cpp
@@ -113,7 +113,7 @@ void UserJumphostHandler::run() {
         }
       }
       if (fail) {
-        STERROR << "Connecting to server failed: Connect timeout";
+        LOG(WARNING) << "Connecting to server failed: Connect timeout";
         connectFailCount++;
         if (connectFailCount == 3) {
           throw std::runtime_error("Connect Timeout");

diff --git a/src/terminal/forwarding/ForwardSourceHandler.cpp b/src/terminal/forwarding/ForwardSourceHandler.cpp
@@ -109,7 +109,7 @@ void ForwardSourceHandler::sendDataOnSocket(int socketId, const string& data) {
 void ForwardSourceHandler::closeSocket(int socketId) {
   auto it = socketFdMap.find(socketId);
   if (it == socketFdMap.end()) {
-    STERROR << "Tried to remove a socket that no longer exists!";
+    LOG(WARNING) << "Tried to remove a socket that no longer exists!";
   } else {
     socketHandler->close(it->second);
     socketFdMap.erase(it);