浏览代码

don't unborrow bad connections

pool will clean them up later
Grant Limberg 2 年之前
父节点
当前提交
3efb731b40
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      controller/PostgreSQL.cpp

+ 0 - 4
controller/PostgreSQL.cpp

@@ -527,9 +527,6 @@ AuthInfo PostgreSQL::getSSOAuthInfo(const nlohmann::json &member, const std::str
 
 
 		_pool->unborrow(c);
 		_pool->unborrow(c);
 	} catch (std::exception &e) {
 	} catch (std::exception &e) {
-		if (c) {
-			_pool->unborrow(c);
-		}
 		fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what());
 		fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what());
 	}
 	}
 
 
@@ -1051,7 +1048,6 @@ void PostgreSQL::heartbeat()
 				w.commit();
 				w.commit();
 			} catch (std::exception &e) {
 			} catch (std::exception &e) {
 				fprintf(stderr, "%s: Heartbeat update failed: %s\n", controllerId, e.what());
 				fprintf(stderr, "%s: Heartbeat update failed: %s\n", controllerId, e.what());
-				_pool->unborrow(c);
 				std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 				std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 				continue;
 				continue;
 			}
 			}