revert from stream to list

Base-DAQ @ 98d5831a

-Subproject commit 4ab0a2d1455b3f285bba05e54c732772ad6852ac
+Subproject commit 98d5831a3058e261def1b2c2df3f6bc848920eb9

include/Redis_Receiver.h

@@ -24,7 +24,6 @@ protected:
 	int port;
 
 	void split_ip_port(const std::string& ip_port, std::string& ip, std::string& port);
-	bool checkRedisStream(redisReply &r);
 public:
 	RedisReceiver(std::string ip, int prt, std::string key);
 	~RedisReceiver() {

src/Redis_Receiver.cpp

@@ -38,12 +38,11 @@ int RedisReceiver::connectToServer() { // no differences in implementation
 	return connectToClient();
 }
 
-
-int RedisReceiver::closeConnectionToServer(){
+int RedisReceiver::closeConnectionToServer() {
 	redisFree(context);
 	return 1;
 }
-int RedisReceiver::closeConnectionToClient(){
+int RedisReceiver::closeConnectionToClient() {
 	redisFree(context);
 	return 1;
 }
@@ -62,39 +61,28 @@ bool RedisReceiver::isConnectedToServer() const {
  * @return number of bytes received [-1 error, 0 done]
  */
 int RedisReceiver::receiveFromClient(PacketLib::BasePacket &pack) {
-	std::stringstream cmd;
-	cmd << "XREAD BLOCK 0 STREAMS ";
-	cmd << key;
-	cmd << " $";
-	redisReply *r = (redisReply*) redisCommand(context, cmd.str().c_str());
-	if(checkRedisStream(*r)){
-		redisReply *binaryValue = r->element[0]->element[1]->element[0]->element[1]->element[1];
-		int size = binaryValue->len;
-		pack.copyToBinaryPointer(reinterpret_cast<uint8_t*>(binaryValue->str), size);
+	std::string cmd("RPOP ");
+	cmd.append(key);
+	redisReply *r = (redisReply*) redisCommand(context, cmd.c_str());
+	if (r->type == REDIS_REPLY_STRING && r->type != REDIS_REPLY_NIL) {
+		int size = r->len;
+		pack.copyToBinaryPointer(reinterpret_cast<uint8_t*>(r->str), size);
 		freeReplyObject(r);
 		return size;
 
 	}
-	std::cout << "FAIL" << std::endl;
 	freeReplyObject(r);
 	return -1;
-
 }
 
 int RedisReceiver::sendToServer(PacketLib::BasePacket &packet) {
-	uint size = packet.getPacketStructureByteSize();
-	redisReply *r = (redisReply *) redisCommand(context, "XADD %s * data %b",key, packet.getBinaryPointer(), size);
-	  if (r == nullptr || r->type == REDIS_REPLY_ERROR) {
-	        std::cerr << "XADD command failed: " << r->str << std::endl;
-	        return -1;
-	    }
+	uint size = packet.getHeaderSize() + packet.getPayloadSize()
+			+ packet.getTailSize();
+	redisReply *r = (redisReply*) redisCommand(context, "LPUSH %s %b", key,
+			packet.getBinaryPointer(), size);
+	if (r == nullptr || r->type == REDIS_REPLY_ERROR) {
+		std::cerr << "LPUSH command failed: " << r->str << std::endl;
+		return -1;
+	}
 	return size;
-	return 0;
 }
-
-bool RedisReceiver::checkRedisStream(redisReply &r) {
-	if (r.type == REDIS_REPLY_ARRAY && r.element[0] != NULL)
-		return true;
-	return false;
-}
-