hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restructured some for clarity, got rid of the crappy JSON library, general awesomeness.

Browse source
This commit is contained in:
Thulinma 2012-04-07 23:45:03 +02:00
parent 022ff26205
commit e3ecdb1e4b
34 changed files with 965 additions and 6996 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Buffer/Makefile
View file

@ -1,4 +1,4 @@
SRC = main.cpp ../util/json/json_reader.cpp ../util/json/json_value.cpp ../util/json/json_writer.cpp ../util/socket.cpp ../util/dtsc.cpp
SRC = main.cpp ../util/json.cpp ../util/socket.cpp ../util/dtsc.cpp
OBJ = $(SRC:.cpp=.o)
OUT = DDV_Buffer
INCLUDES =

14
Buffer/main.cpp
View file

@ -14,7 +14,7 @@
#include <sys/time.h>
#include "../util/dtsc.h" //DTSC support
#include "../util/socket.h" //Socket lib
#include "../util/json/json.h"
#include "../util/json.h"
/// Holds all code unique to the Buffer.
namespace Buffer{
@ -27,7 +27,7 @@ namespace Buffer{
}//getNowMS
Json::Value Storage = Json::Value(Json::objectValue); ///< Global storage of data.
JSON::Value Storage; ///< Global storage of data.
///A simple signal handler that ignores all signals.
void termination_handler (int signum){
@ -201,9 +201,9 @@ namespace Buffer{
Socket::Connection std_input(fileno(stdin));
Socket::Connection StatsSocket = Socket::Connection("/tmp/ddv_statistics", true);
Storage["log"] = Json::Value(Json::objectValue);
Storage["curr"] = Json::Value(Json::objectValue);
Storage["totals"] = Json::Value(Json::objectValue);
Storage["log"] = JSON::Value();
Storage["curr"] = JSON::Value();
Storage["totals"] = JSON::Value();
while (!feof(stdin) || ip_waiting){
@ -228,8 +228,8 @@ namespace Buffer{
StatsSocket = Socket::Connection("/tmp/ddv_statistics", true);
}
if (StatsSocket.connected()){
StatsSocket.write(Storage.toStyledString()+"\n\n");
Storage["log"].clear();
StatsSocket.write(Storage.toString()+"\n\n");
Storage["log"].null();
}
}
//invalidate the current buffer