Merge pull request #4 from jimbao/stratosnn-patch-1

Allow messages to flow into progress IPC
jimbao · Dec 9, 2020 · 98a10d6 · 98a10d6
2 parents b50d3f8 + 6459159
commit 98a10d6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/core/notifier.c b/core/notifier.c
@@ -189,10 +189,6 @@ static void process_notifier (RECOVERY_STATUS status, int event, int level, cons
 {
 	(void)level;
 
-	/* Check just in case a process want to send an info outside */
-	if (status != SUBPROCESS)
-	       return;
-
 	switch (event) {
 	case (CANCELUPDATE):
 		status = FAILURE;

diff --git a/corelib/progress_thread.c b/corelib/progress_thread.c
@@ -149,7 +149,7 @@ void swupdate_progress_info(RECOVERY_STATUS status, int cause, const char *info)
 {
 	struct swupdate_progress *prbar = &progress;
 	pthread_mutex_lock(&prbar->lock);
-	snprintf(prbar->msg.info, sizeof(prbar->msg.info), "{\"%d\": %s}",
+	snprintf(prbar->msg.info, sizeof(prbar->msg.info), "{\"%d\": \"%s\"}",
 			cause, info);
 	prbar->msg.infolen = strlen(prbar->msg.info);
 	prbar->msg.status = status;