[Daemon] handle error code

Clearly handle error code when initializing mlops-agent daemon.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

Author: jaeyun-jung

daemon/main.c

@@ -51,8 +51,10 @@ postinit (void)
   signal (SIGTERM, handle_sigterm);
 
   ret = gdbus_get_name (DBUS_ML_BUS_NAME);
-  if (ret < 0)
+  if (ret < 0) {
+    ml_loge ("Failed to get mlops-agent dbus.");
     return ret;
+  }
 
   return 0;
 }
@@ -104,23 +106,28 @@ main (int argc, char **argv)
 {
   int ret = 0;
 
-  if (parse_args (&argc, &argv)) {
-    ret = -EINVAL;
+  ret = parse_args (&argc, &argv);
+  if (ret < 0)
     goto error;
-  }
 
   /* path to database */
   if (!db_path)
     db_path = g_strdup (DB_PATH);
 
-  ml_agent_initialize (db_path);
+  ret = ml_agent_initialize (db_path);
+  if (ret < 0)
+    goto error;
 
   g_mainloop = g_main_loop_new (NULL, FALSE);
-  gdbus_get_system_connection (is_session);
+  ret = gdbus_get_system_connection (is_session);
+  if (ret < 0)
+    goto error;
 
   init_modules (NULL);
-  if (postinit () < 0)
-    ml_loge ("cannot init system");
+
+  ret = postinit ();
+  if (ret < 0)
+    goto error;
 
   g_main_loop_run (g_mainloop);
   exit_modules (NULL);
@@ -133,7 +140,6 @@ main (int argc, char **argv)
   ml_agent_finalize ();
 
   is_session = verbose = FALSE;
-  g_free (db_path);
-  db_path = NULL;
+  g_clear_pointer (&db_path, g_free);
   return ret;
 }

daemon/mlops-agent-internal.c

@@ -16,14 +16,27 @@
 /**
  * @brief Internal function to initialize mlops-agent interface.
  */
-void
+int
 ml_agent_initialize (const char *db_path)
 {
-  g_assert (STR_IS_VALID (db_path));
-  g_assert (g_file_test (db_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
+  int ret;
+
+  if (!STR_IS_VALID (db_path) ||
+      !g_file_test (db_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+    ml_loge ("Failed to initialize mlops-agent, database path (%s) is invalid.", db_path);
+    return -EINVAL;
+  }
+
+  ret = svcdb_initialize (db_path);
+  if (ret < 0)
+    goto error;
+
+  ret = mlops_node_initialize ();
 
-  svcdb_initialize (db_path);
-  mlops_node_initialize ();
+error:
+  if (ret < 0)
+    ml_agent_finalize ();
+  return ret;
 }
 
 /**

daemon/mlops-agent-internal.h

@@ -32,7 +32,7 @@ typedef enum
 /**
  * @brief Internal function to initialize mlops-agent interface.
  */
-void ml_agent_initialize (const char *db_path);
+int ml_agent_initialize (const char *db_path);
 
 /**
  * @brief Internal function to finalize mlops-agent interface.

daemon/mlops-agent-node.c

@@ -115,16 +115,24 @@ _mlops_node_free (gpointer data)
 /**
  * @brief Initialize mlops node info.
  */
-void
+int
 mlops_node_initialize (void)
 {
+  int ret = 0;
+
   G_LOCK (mlops_node_table);
   if (!g_mlops_node_table) {
     g_mlops_node_table = g_hash_table_new_full (g_int64_hash, g_int64_equal,
         g_free, _mlops_node_free);
   }
-  g_assert (g_mlops_node_table != NULL);
+
+  if (g_mlops_node_table == NULL) {
+    ml_logw ("Failed to initialize mlops-agent node table.");
+    ret = -EIO;
+  }
   G_UNLOCK (mlops_node_table);
+
+  return ret;
 }
 
 /**

daemon/mlops-agent-node.h

@@ -35,7 +35,7 @@ typedef enum
 /**
  * @brief Initialize mlops node info.
  */
-void mlops_node_initialize (void);
+int mlops_node_initialize (void);
 
 /**
  * @brief Finalize mlops node info.

daemon/service-db-util.h

@@ -18,7 +18,7 @@
 
 G_BEGIN_DECLS
 
-void svcdb_initialize (const gchar *path);
+gint svcdb_initialize (const gchar *path);
 void svcdb_finalize (void);
 gint svcdb_pipeline_set (const gchar *name, const gchar *description);
 gint svcdb_pipeline_get (const gchar *name, gchar **description);

daemon/service-db.cc

@@ -868,9 +868,11 @@ G_BEGIN_DECLS
 /**
  * @brief Initialize the service-db.
  */
-void
+gint
 svcdb_initialize (const gchar *path)
 {
+  gint ret = 0;
+
   if (g_svcdb_instance) {
     ml_logw ("ML service DB is already opened, close old DB.");
     svcdb_finalize ();
@@ -880,11 +882,12 @@ svcdb_initialize (const gchar *path)
     g_svcdb_instance = new MLServiceDB (path);
     g_svcdb_instance->connectDB ();
   } catch (const std::exception &e) {
-    ml_loge ("%s", e.what ());
+    ml_loge ("Failed to initialize database: %s", e.what ());
     svcdb_finalize ();
+    ret = -EIO;
   }
 
-  g_assert (g_svcdb_instance);
+  return ret;
 }
 
 /**