sleepd : Changed free text logging information to KV Pair

:Release Notes:
Changed free text logging information to KV Pair

:Detailed Notes:
Changed free text logging information to KV Pair

:Testing Performed:
Tested on official build and logs appear
in KV pairs in /var/log/messages.

:QA Notes:

:Issues Addressed:
[GF-44127] Sleepd logging valuable information in free text fields

Open-webOS-DCO-1.0-Signed-off-by: Premalatha MVS <[email protected]>

Change-Id: I01ad828c54e17bd455877022ac19a0207577db61
Reviewed-on: https://g2g.palm.com/3783
Reviewed-by: Build Verification
Reviewed-by: Premalatha MVS <[email protected]>
Tested-by: Premalatha MVS <[email protected]>
Reviewed-by: Keith Derrick <[email protected]>

Author: premalathamvs

include/internal/logging.h

@@ -28,7 +28,7 @@
  * kvcount - count for key-value pairs
  * ... - key-value pairs and free text. key-value pairs are formed using PMLOGKS or PMLOGKFV
  * e.g.)
- * LOG_CRITICAL(msgid, 2, PMLOGKS("key1", "value1"), PMLOGKFV("key2", "%s", value2), "free text message");
+ * LOG_CRITICAL(msgid, 2, PMLOGKS("key1", "value1"), PMLOGKFV("key2", "%d", value2), "free text message");
  **********************************************/
 #define SLEEPDLOG_CRITICAL(msgid, kvcount, ...) \
         PmLogCritical(getsleepdcontext(), msgid, kvcount, ##__VA_ARGS__)
@@ -71,7 +71,6 @@
 /** timeout_alarm.c */
 #define MSGID_RTC_ERR                             "RTC_ERR"                        //RTC not working properly
 #define MSGID_SELECT_EXPIRY_ERR                   "SELECT_EXPIRY_ERR"              //Failed to select expiry from timeout db
-#define MSGID_RTC_ERR                             "RTC_ERR"                        //RTC not working properly
 #define MSGID_TIMEOUT_MSG_ERR                     "TIMEOUT_MSG_ERR"                //could not send timeout message
 #define MSGID_SQLITE_STEP_FAIL                    "SQLITE_STEP_FAIL"               //sqlite3 step error
 #define MSGID_SQLITE_FINALIZE_FAIL                "SQLITE_FINALIZE_FAIL"           //sqlite3 finalize error
@@ -100,7 +99,7 @@
 #define MSGID_NAMED_HOOK_LIST_OOM                 "NAMED_HOOK_LIST_OOM"            //Out of memory on initialization
 
 /** timesaver.c */
-#define MSGID_TIME_NOT_SAVED_TO_DB                "TIME_NOT_SAVED_TO_DB"           //time not be saved to db before battery was pulledout
+#define MSGID_TIME_NOT_SAVED                      "TIME_NOT_SAVED"                //time not be saved to temp file before battery was pulledout
 
 /** activity.c */
 

src/alarms/timeout_alarm.c

@@ -952,9 +952,9 @@ _rtc_check(gpointer data)
 	if (this_time == sLastRTCTime)
 	{
 		sNumTimes++;
-		SLEEPDLOG_WARNING(MSGID_RTC_ERR, 1, PMLOGKFV(NYX_QUERY_TIME, "%ld", this_time),
-		                  "RTC appears not to be ticking, number of times showing same RTC time : %ld",
-		                  sNumTimes);
+		SLEEPDLOG_WARNING(MSGID_RTC_ERR, 2, PMLOGKFV(NYX_QUERY_TIME, "%ld", this_time),
+			              PMLOGKFV("RTC_TIME","%ld",sNumTimes),
+		                  "RTC appears not to be ticking,showing same RTC time");
 	}
 	else
 	{
@@ -1511,8 +1511,7 @@ _alarms_timeout_init(void)
 
 	if (!retVal)
 	{
-		SLEEPDLOG_ERROR(MSGID_DB_OPEN_ERR, 0, "Failed to open database %s",
-		                timeout_db_name);
+		SLEEPDLOG_ERROR(MSGID_DB_OPEN_ERR, 1, PMLOGKS("DBName",timeout_db_name),"Failed to open database");
 		goto error;
 	}
 

src/pwrevents/machine.c

@@ -163,8 +163,8 @@ void MachineSleep(void)
 void
 MachineForceShutdown(const char *reason)
 {
-	SLEEPDLOG_INFO(MSGID_FRC_SHUTDOWN, 0,
-	               "Pwrevents shutting down system because of %s", reason);
+	SLEEPDLOG_INFO(MSGID_FRC_SHUTDOWN, 1, PMLOGKS("Reason",reason),
+	               "Pwrevents shutting down system");
 
 #ifdef REBOOT_TAKES_REASON
 
@@ -194,8 +194,7 @@ MachineForceShutdown(const char *reason)
 void
 MachineForceReboot(const char *reason)
 {
-	SLEEPDLOG_INFO(MSGID_FRC_REBOOT, 0, "Pwrevents rebooting system because of %s",
-	               reason);
+	SLEEPDLOG_INFO(MSGID_FRC_REBOOT, 1,PMLOGKS("Reason",reason), "Pwrevents rebooting system");
 
 #ifdef REBOOT_TAKES_REASON
 

src/pwrevents/shutdown.c

@@ -791,6 +791,7 @@ send_reply(LSHandle *sh, LSMessage *message,
 	bool retVal;
 	char *payload;
 	va_list vargs;
+    gchar* payloadStr = NULL;
 
 	va_start(vargs, format);
 	payload = g_strdup_vprintf(format, vargs);
@@ -800,8 +801,10 @@ send_reply(LSHandle *sh, LSMessage *message,
 
 	if (!retVal)
 	{
-		SLEEPDLOG_WARNING(MSGID_LSMSG_REPLY_FAIL, 0,
-		                  "Could not send reply with payload : %s", payload);
+		payloadStr = g_strescape(payload,NULL);
+		SLEEPDLOG_WARNING(MSGID_LSMSG_REPLY_FAIL, 1,PMLOGKS("payload",payloadStr),
+		                  "Could not send reply");
+		g_free(payloadStr);
 	}
 
 	g_free(payload);

src/utils/timesaver.c

@@ -70,8 +70,7 @@ timesaver_save()
 
 		if (file < 0)
 		{
-			SLEEPDLOG_WARNING(MSGID_TIME_NOT_SAVED_TO_DB, 0,
-			                  "Could not save time to \"%s\"", time_db_tmp);
+			SLEEPDLOG_WARNING(MSGID_TIME_NOT_SAVED, 1, PMLOGKS("FileName",time_db_tmp), "Could not save time");
 		}
 		else
 		{