瀏覽代碼

make DB::_memberChanged and _networkChanged virtual

Grant Limberg 4 年之前
父節點
當前提交
19f4146aca
共有 3 個文件被更改,包括 9 次插入5 次删除
  1. 2 0
      controller/DB.cpp
  2. 2 2
      controller/DB.hpp
  3. 5 3
      controller/PostgreSQL.hpp

+ 2 - 0
controller/DB.cpp

@@ -197,6 +197,7 @@ void DB::networks(std::set<uint64_t> &networks)
 
 void DB::_memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners)
 {
+	fprintf(stderr, "DB::_memberChanged\n");
 	uint64_t memberId = 0;
 	uint64_t networkId = 0;
 	bool isAuth = false;
@@ -312,6 +313,7 @@ void DB::_memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool no
 
 void DB::_networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners)
 {
+	fprintf(stderr, "DB::_networkChanged\n");
 	if (networkConfig.is_object()) {
 		const std::string ids = networkConfig["id"];
 		const uint64_t networkId = Utils::hexStrToU64(ids.c_str());

+ 2 - 2
controller/DB.hpp

@@ -147,8 +147,8 @@ protected:
 		std::mutex lock;
 	};
 
-	void _memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners);
-	void _networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners);
+	virtual void _memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners);
+	virtual void _networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners);
 	void _fillSummaryInfo(const std::shared_ptr<_Network> &nw,NetworkSummaryInfo &info);
 
 	std::vector<DB::ChangeListener *> _changeListeners;

+ 5 - 3
controller/PostgreSQL.hpp

@@ -110,12 +110,14 @@ protected:
 	{
 		inline std::size_t operator()(const std::pair<uint64_t,uint64_t> &p) const { return (std::size_t)(p.first ^ p.second); }
 	};
-	void _memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners) {
+	virtual void _memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool notifyListeners) {
+		fprintf(stderr, "PostgreSQL::_memberChanged\n");
 		DB::_memberChanged(old, memberConfig, notifyListeners);
 	}
 
-	void _networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners) {
-		DB::_memberChanged(old, networkConfig, notifyListeners);
+	virtual void _networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool notifyListeners) {
+		fprintf(stderr, "PostgreSQL::_networkChanged\n");
+		DB::_networkChanged(old, networkConfig, notifyListeners);
 	}
 
 private: