Apply suggestions from code review

Co-authored-by: Miyuru Dayarathna <[email protected]>
miyurud · Sep 4, 2023 · b4e0eb5 · b4e0eb5
1 parent 8457f6e
commit b4e0eb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ RUN pip install pandas
 COPY ./build.sh ./build.sh
 COPY ./run-docker.sh ./run-docker.sh
 COPY ./CMakeLists.txt ./CMakeLists.txt
-COPY ./src_python ./src-python
+COPY ./src_python ./src_python
 COPY ./main.h ./main.h
 COPY ./main.cpp ./main.cpp
 COPY ./src ./src

diff --git a/src/server/JasmineGraphInstanceService.cpp b/src/server/JasmineGraphInstanceService.cpp
@@ -1690,7 +1690,7 @@ void *instanceservicesession(void *dummyPt) {
             string trainData(data);
 
             std::vector<std::string> trainargs = Utils::split(trainData, ' ');
-            instance_logger.info("Train Data : " + trainData);
+            instance_logger.info("Received options : " + trainData);
             string graphID;
             string partitionID = trainargs[trainargs.size() - 1];
 
@@ -1762,7 +1762,7 @@ void *instanceservicesession(void *dummyPt) {
             string trainData(data);
 
             std::vector<std::string> trainargs = Utils::split(trainData, ' ');
-            instance_logger.info("Train Data : " + trainData);
+            instance_logger.info("Received options : " + trainData);
             string graphID;
             string partitionID = trainargs[trainargs.size() - 1];
 
@@ -4489,7 +4489,7 @@ void JasmineGraphInstanceService::initServer(string trainData){
                                 + " " + utils.getJasmineGraphProperty("org.jasminegraph.fl.dataDir")+ " "+ graphID + " 0 "
                                 + utils.getJasmineGraphProperty("org.jasminegraph.fl_clients")
                                 + " " + utils.getJasmineGraphProperty("org.jasminegraph.fl.epochs") +" localhost 5000 > " 
-                                + "/home/ubuntu/software/jasminegraph/logs/server_logs" + Utils::getCurrentTimestamp() + ".txt";
+                                + "/home/ubuntu/software/jasminegraph/logs/server_logs-" + Utils::getCurrentTimestamp() + ".txt";
     instance_logger.log("Executing : " + command, "info");
     popen(command.c_str(), "r");
 }
@@ -4513,7 +4513,7 @@ void JasmineGraphInstanceService::initOrgServer(string trainData){
     std::string path = "cd " + utils.getJasmineGraphProperty("org.jasminegraph.fl.location") + " && ";
     std::string command = path + "python3.11 org_server.py " + graphID+ " " + utils.getJasmineGraphProperty("org.jasminegraph.fl_clients")
                                     + " " + utils.getJasmineGraphProperty("org.jasminegraph.fl.epochs")
-                                    +" localhost 5050 > /home/ubuntu/software/jasminegraph/logs/org_server_logs" + Utils::getCurrentTimestamp() + ".txt";
+                                    +" localhost 5050 > /home/ubuntu/software/jasminegraph/logs/org_server_logs-" + Utils::getCurrentTimestamp() + ".txt";
     instance_logger.log("Executing : " + command, "info");
     popen(command.c_str(), "r");
 }
@@ -4540,7 +4540,7 @@ void JasmineGraphInstanceService::initAgg(string trainData){
                                 + " " + utils.getJasmineGraphProperty("org.jasminegraph.fl.dataDir")+ " " + "4" + " 0 "
                                 + utils.getJasmineGraphProperty("org.jasminegraph.fl.num.orgs")
                                 + " " + utils.getJasmineGraphProperty("org.jasminegraph.fl.epochs") +" localhost 5000 > " 
-                                + "/home/ubuntu/software/jasminegraph/logs/agg_logs" + Utils::getCurrentTimestamp() + ".txt";
+                                + "/home/ubuntu/software/jasminegraph/logs/agg_logs-" + Utils::getCurrentTimestamp() + ".txt";
     instance_logger.log("Executing : " + command, "info");
     popen(command.c_str(), "r");
 }