diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 963d4bb..a4ce240 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -1516,12 +1516,13 @@ public class delegationServices { String bugType = Lrequest.get("bugType").toString(); String bugDetails = Lrequest.get("bugDetails").toString(); String bugSeverity = Lrequest.get("bugSeverity").toString(); + String UUID = Lrequest.get("UUID").toString(); String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S try { - File myObj = new File(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt"); + File myObj = new File(homedir + "/ocs/logs/" + applicationName + UUID + timeCurrent + ".txt"); if (myObj.createNewFile()) { System.out.println("Log File created: " + myObj.getName()); - FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt", true); + FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + UUID + timeCurrent + ".txt", true); writer.write("This bug report is for: " + applicationName); writer.write("\r\n"); writer.write("The bug severity is level: " + bugSeverity); @@ -1539,7 +1540,7 @@ public class delegationServices { System.out.println("Log already exists."); } } catch (IOException e) { - System.out.println("An error occurred when attempting to log."); + System.out.println("An error occurred when attempting to log." + e); } BasicDBObject updateQuery = new BasicDBObject(); updateQuery.append("$set", @@ -1557,12 +1558,13 @@ public class delegationServices { String bugDetails = Lrequest.get("bugDetails").toString(); String bugSeverity = Lrequest.get("bugSeverity").toString(); String bugLog = Lrequest.get("bugLog").toString(); + String UUID = Lrequest.get("UUID").toString(); String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S try { - File myObj = new File(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt"); + File myObj = new File(homedir + "/ocs/logs/" + applicationName + UUID + timeCurrent + ".txt"); if (myObj.createNewFile()) { System.out.println("Log File created: " + myObj.getName()); - FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt", true); + FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + UUID + timeCurrent + ".txt", true); writer.write("This bug report is for: " + applicationName); writer.write("\r\n"); writer.write("The bug severity is level: " + bugSeverity); @@ -1583,7 +1585,7 @@ public class delegationServices { System.out.println("Log already exists."); } } catch (IOException e) { - System.out.println("An error occurred while attempting to log."); + System.out.println("An error occurred while attempting to log." + e); } BasicDBObject updateQuery = new BasicDBObject(); updateQuery.append("$set", @@ -1602,12 +1604,12 @@ public class delegationServices { String UUID = Lrequest.get("UUID").toString(); String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S try { - File myObj = new File(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt"); + File myObj = new File(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + timeCurrent + ".txt"); File myFold = new File(homedir + "/ocs/telemetry/" + UUID); myFold.mkdir(); if (myObj.createNewFile()) { System.out.println("Log File created: " + myObj.getName()); - FileWriter writer = new FileWriter(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt", true); + FileWriter writer = new FileWriter(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + timeCurrent + ".txt", true); writer.write("This Telemetry report is for: " + applicationName); writer.write("\r\n"); writer.write("Type of telemetry: " + telemetryType); @@ -1623,7 +1625,7 @@ public class delegationServices { System.out.println("Log already exists."); } } catch (IOException e) { - System.out.println("An error occurred when attempting to log."); + System.out.println("An error occurred when attempting to log." + e); } BasicDBObject updateQuery = new BasicDBObject(); updateQuery.append("$set", @@ -1643,12 +1645,12 @@ public class delegationServices { String UUID = Lrequest.get("UUID").toString(); String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S try { - File myObj = new File(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt"); + File myObj = new File(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + "logfile" + timeCurrent + ".txt"); File myFold = new File(homedir + "/ocs/telemetry/" + UUID); myFold.mkdir(); if (myObj.createNewFile()) { System.out.println("Log File created: " + myObj.getName()); - FileWriter writer = new FileWriter(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + telemetryDetails + timeCurrent + ".txt", true); + FileWriter writer = new FileWriter(homedir + "/ocs/telemetry/" + UUID + "/" + applicationName + "logfile" + timeCurrent + ".txt", true); writer.write("This telemetry report is for: " + applicationName); writer.write("\r\n"); writer.write("The telemetry type is: " + telemetryType); @@ -1667,7 +1669,7 @@ public class delegationServices { System.out.println("telemetry already exists. (wow that's rare)"); } } catch (IOException e) { - System.out.println("An error occurred while attempting to save telemetry."); + System.out.println("An error occurred while attempting to save telemetry." + e); } BasicDBObject updateQuery = new BasicDBObject(); updateQuery.append("$set", @@ -2298,7 +2300,7 @@ public class delegationServices { System.out.println("telemetry already exists. (wow that's rare)"); } } catch (IOException e) { - System.out.println("An error occurred while attempting to save telemetry."); + System.out.println("An error occurred while attempting to save telemetry." + e); } BasicDBObject updateQuery = new BasicDBObject(); updateQuery.append("$set",