Commit bde7bdde authored by Christopher Reis's avatar Christopher Reis

Updated Info for use in Containers

parent d1942a0a
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#include "PublishThread.hpp" #include "PublishThread.hpp"
#include <cstdlib>
#include <chrono>
#include <string> #include <string>
#include <curl/curl.h> #include <curl/curl.h>
...@@ -62,7 +64,7 @@ void CALL_TYPE PublishThread::run() ...@@ -62,7 +64,7 @@ void CALL_TYPE PublishThread::run()
//o Delay to allow subscriber thread to set up //o Delay to allow subscriber thread to set up
example::millisleep(100); example::millisleep(100);
std::ifstream myfile ("dictionary.json"); std::ifstream myfile ("/GMSEC_API/bin/dictionary_adaptor.json");
std::string str((std::istreambuf_iterator<char>(myfile)), (std::istreambuf_iterator<char>())); std::string str((std::istreambuf_iterator<char>(myfile)), (std::istreambuf_iterator<char>()));
dictionary = json::parse(str); dictionary = json::parse(str);
for (size_t i = 0; i < dictionary["subsystems"].size(); i++) { for (size_t i = 0; i < dictionary["subsystems"].size(); i++) {
...@@ -138,6 +140,11 @@ void PublishThread::publish(const char* subject) ...@@ -138,6 +140,11 @@ void PublishThread::publish(const char* subject)
// document.rapidjson::ParseStream(is); // document.rapidjson::ParseStream(is);
// //
// } // }
unsigned long PublishThread::get_time(){
using namespace std::chrono;
unsigned long millis = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
return millis;
}
void PublishThread::get_v(){ void PublishThread::get_v(){
CURL *curl; CURL *curl;
...@@ -154,6 +161,7 @@ void PublishThread::get_v(){ ...@@ -154,6 +161,7 @@ void PublishThread::get_v(){
//std::cout << readBuffer << std::endl; //std::cout << readBuffer << std::endl;
std::string subject = "GMSEC.KSP.MSG.TLM.PROCESSED.V"; std::string subject = "GMSEC.KSP.MSG.TLM.PROCESSED.V";
Message message(subject.c_str(), Message::PUBLISH); Message message(subject.c_str(), Message::PUBLISH);
message.addField("PUBLISH-TIME-UL", (GMSEC_I64) get_time());
for (json::iterator it = js.begin(); it != js.end(); ++it) { for (json::iterator it = js.begin(); it != js.end(); ++it) {
if (it.value().is_string()) { if (it.value().is_string()) {
std::string field(it.key()); std::string field(it.key());
...@@ -183,6 +191,7 @@ void PublishThread::get_o(){ ...@@ -183,6 +191,7 @@ void PublishThread::get_o(){
//std::cout << readBuffer << std::endl; //std::cout << readBuffer << std::endl;
std::string subject = "GMSEC.KSP.MSG.TLM.PROCESSED.O"; std::string subject = "GMSEC.KSP.MSG.TLM.PROCESSED.O";
Message message(subject.c_str(), Message::PUBLISH); Message message(subject.c_str(), Message::PUBLISH);
message.addField("PUBLISH-TIME-UL", (GMSEC_I64) get_time());
for (json::iterator it = js.begin(); it != js.end(); ++it) { for (json::iterator it = js.begin(); it != js.end(); ++it) {
if (it.value().is_string()) { if (it.value().is_string()) {
std::string field(it.key()); std::string field(it.key());
...@@ -211,6 +220,7 @@ void PublishThread::get_n(){ ...@@ -211,6 +220,7 @@ void PublishThread::get_n(){
json js = json::parse(readBuffer); json js = json::parse(readBuffer);
std::string subject = "GMSEC.KSP.MSG.TLM.PROCESSED.N"; std::string subject = "GMSEC.KSP.MSG.TLM.PROCESSED.N";
Message message(subject.c_str(), Message::PUBLISH); Message message(subject.c_str(), Message::PUBLISH);
message.addField("PUBLISH-TIME-UL", (GMSEC_I64) get_time());
for (json::iterator it = js.begin(); it != js.end(); ++it) { for (json::iterator it = js.begin(); it != js.end(); ++it) {
if (it.value().is_string()) { if (it.value().is_string()) {
std::string field(it.key()); std::string field(it.key());
......
...@@ -32,6 +32,8 @@ public: ...@@ -32,6 +32,8 @@ public:
void get_o(); void get_o();
void get_n(); void get_n();
unsigned long get_time();
void CALL_TYPE run(); void CALL_TYPE run();
void CALL_TYPE shutdown(); void CALL_TYPE shutdown();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment