Move RedisClient class to sonic-swss-common repo (sonic-net#113)

dmytroxshevchuk · Nov 8, 2016 · dc040e2 · dc040e2
1 parent 415c3e6
commit dc040e2
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 342 deletions.
diff --git a/common/redisclient.cpp b/common/redisclient.cpp
diff --git a/common/redisclient.h b/common/redisclient.h
diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
@@ -11,8 +11,8 @@
 extern "C" {
 #include "sai.h"
 }
-#include "common/redisclient.h"
 
+#include "swss/redisclient.h"
 #include "swss/dbconnector.h"
 #include "swss/producertable.h"
 #include "swss/consumertable.h"

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -41,8 +41,7 @@ libsairedis_la_SOURCES = \
 			 sai_redis_generic_set.cpp \
 			 sai_redis_generic_get.cpp \
 			 sai_redis_notifications.cpp \
-			 sai_redis_record.cpp \
-			 ../../common/redisclient.cpp
+			 sai_redis_record.cpp
 
 libsairedis_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
 libsairedis_la_LIBADD = -lhiredis -lswsscommon

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -26,8 +26,7 @@ syncd_SOURCES = \
 				syncd_reinit.cpp \
 				syncd_hard_reinit.cpp \
 				syncd_notifications.cpp \
-				syncd_counters.cpp \
-				../common/redisclient.cpp
+				syncd_counters.cpp
 
 syncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS)
 syncd_LDADD = -lhiredis -lswsscommon -lsai -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata

diff --git a/syncd/syncd.h b/syncd/syncd.h
@@ -25,9 +25,9 @@ extern "C" {
 #include "sai.h"
 }
 
-#include "common/redisclient.h"
 #include "meta/saiserialize.h"
 #include "meta/saiattributelist.h"
+#include "swss/redisclient.h"
 #include "swss/dbconnector.h"
 #include "swss/producertable.h"
 #include "swss/consumertable.h"