packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
iSulad/0020-init-log-config-should-before-command-parse.patch
haozi007 e72b756384 iSulad: sync with upstream iSulad 
Signed-off-by: haozi007 <liuhao27@huawei.com>
2021-03-23 09:50:40 +08:00

624 lines
28 KiB
Diff
Raw Blame History

From 20a6562ea0a6c50bdc6a863067eeaf7fa04909d0 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Sat, 30 Jan 2021 14:46:13 +0800
Subject: [PATCH 20/53] init log config should before command parse
Signed-off-by: haozi007 <liuhao27@huawei.com>
---
src/cmd/isula/base/create.c | 2 +-
src/cmd/isula/base/kill.c | 2 +-
src/cmd/isula/base/rename.c | 2 +-
src/cmd/isula/base/restart.c | 2 +-
src/cmd/isula/base/rm.c | 2 +-
src/cmd/isula/base/run.c | 2 +-
src/cmd/isula/base/start.c | 2 +-
src/cmd/isula/base/stop.c | 2 +-
src/cmd/isula/extend/events.c | 2 +-
src/cmd/isula/extend/stats.c | 2 +-
src/cmd/isula/extend/update.c | 2 +-
src/cmd/isula/images/images.c | 2 +-
src/cmd/isula/images/import.c | 2 +-
src/cmd/isula/images/load.c | 2 +-
src/cmd/isula/images/login.c | 2 +-
src/cmd/isula/images/logout.c | 2 +-
src/cmd/isula/images/pull.c | 2 +-
src/cmd/isula/images/rmi.c | 2 +-
src/cmd/isula/images/tag.c | 2 +-
src/cmd/isula/information/info.c | 2 +-
src/cmd/isula/information/inspect.c | 2 +-
src/cmd/isula/information/logs.c | 2 +-
src/cmd/isula/information/ps.c | 2 +-
src/cmd/isula/information/top.c | 2 +-
src/cmd/isula/information/version.c | 2 +-
src/cmd/isula/information/wait.c | 2 +-
src/cmd/isula/stream/attach.c | 2 +-
src/cmd/isula/stream/cp.c | 2 +-
src/cmd/isula/stream/exec.c | 2 +-
src/cmd/isula/volume/list.c | 2 +-
src/cmd/isula/volume/prune.c | 2 +-
src/cmd/isula/volume/remove.c | 2 +-
32 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/cmd/isula/base/create.c b/src/cmd/isula/base/create.c
index 12f0a8be..a531fc0e 100644
--- a/src/cmd/isula/base/create.c
+++ b/src/cmd/isula/base/create.c
@@ -1538,6 +1538,7 @@ int cmd_create_main(int argc, const char **argv)
g_cmd_create_args) COMMON_OPTIONS(g_cmd_create_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_create_desc,
g_cmd_create_usage);
if (command_parse_args(&cmd, &g_cmd_create_args.argc, &g_cmd_create_args.argv) ||
@@ -1545,7 +1546,6 @@ int cmd_create_main(int argc, const char **argv)
nret = EINVALIDARGS;
goto out;
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/base/kill.c b/src/cmd/isula/base/kill.c
index b8e85459..7c8bf95c 100644
--- a/src/cmd/isula/base/kill.c
+++ b/src/cmd/isula/base/kill.c
@@ -92,12 +92,12 @@ int cmd_kill_main(int argc, const char **argv)
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_kill_args)
KILL_OPTIONS(g_cmd_kill_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_kill_desc,
g_cmd_kill_usage);
if (command_parse_args(&cmd, &g_cmd_kill_args.argc, &g_cmd_kill_args.argv)) {
exit(ECOMMON);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("log init failed\n");
exit(ECOMMON);
diff --git a/src/cmd/isula/base/rename.c b/src/cmd/isula/base/rename.c
index aafc9bda..c5cf5bb6 100644
--- a/src/cmd/isula/base/rename.c
+++ b/src/cmd/isula/base/rename.c
@@ -67,12 +67,12 @@ int cmd_rename_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_rename_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_rename_args)) {
COMMAND_ERROR("client arguments init failed\n");
exit(ECOMMON);
}
g_cmd_rename_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_rename_desc,
g_cmd_rename_usage);
if (command_parse_args(&cmd, &g_cmd_rename_args.argc, &g_cmd_rename_args.argv)) {
diff --git a/src/cmd/isula/base/restart.c b/src/cmd/isula/base/restart.c
index cedfaec1..877b0ff3 100644
--- a/src/cmd/isula/base/restart.c
+++ b/src/cmd/isula/base/restart.c
@@ -73,12 +73,12 @@ int cmd_restart_main(int argc, const char **argv)
RESTART_OPTIONS(g_cmd_restart_args)
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_restart_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_restart_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_restart_desc,
g_cmd_restart_usage);
diff --git a/src/cmd/isula/base/rm.c b/src/cmd/isula/base/rm.c
index 9cd0cbd0..13bd4644 100644
--- a/src/cmd/isula/base/rm.c
+++ b/src/cmd/isula/base/rm.c
@@ -118,12 +118,12 @@ int cmd_delete_main(int argc, const char **argv)
DELETE_OPTIONS(g_cmd_delete_args)
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_delete_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_delete_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_delete_desc,
g_cmd_delete_usage);
if (command_parse_args(&cmd, &g_cmd_delete_args.argc, &g_cmd_delete_args.argv)) {
diff --git a/src/cmd/isula/base/run.c b/src/cmd/isula/base/run.c
index 0c82af02..a6068709 100644
--- a/src/cmd/isula/base/run.c
+++ b/src/cmd/isula/base/run.c
@@ -148,13 +148,13 @@ int cmd_run_main(int argc, const char **argv)
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_run_args) CREATE_OPTIONS(g_cmd_run_args)
CREATE_EXTEND_OPTIONS(g_cmd_run_args) RUN_OPTIONS(g_cmd_run_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_run_desc,
g_cmd_run_usage);
if (command_parse_args(&cmd, &g_cmd_run_args.argc, &g_cmd_run_args.argv) || run_checker(&g_cmd_run_args)) {
exit(EINVALIDARGS);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/base/start.c b/src/cmd/isula/base/start.c
index 104c24ae..5e55524f 100644
--- a/src/cmd/isula/base/start.c
+++ b/src/cmd/isula/base/start.c
@@ -327,12 +327,12 @@ int cmd_start_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_start_args) START_OPTIONS(g_cmd_start_args)};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_start_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_start_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_start_desc,
g_cmd_start_usage);
if (command_parse_args(&cmd, &g_cmd_start_args.argc, &g_cmd_start_args.argv)) {
diff --git a/src/cmd/isula/base/stop.c b/src/cmd/isula/base/stop.c
index e52db79c..6a901c42 100644
--- a/src/cmd/isula/base/stop.c
+++ b/src/cmd/isula/base/stop.c
@@ -78,12 +78,12 @@ int cmd_stop_main(int argc, const char **argv)
STOP_OPTIONS(g_cmd_stop_args)
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_stop_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_stop_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_stop_desc,
g_cmd_stop_usage);
if (command_parse_args(&cmd, &g_cmd_stop_args.argc, &g_cmd_stop_args.argv)) {
diff --git a/src/cmd/isula/extend/events.c b/src/cmd/isula/extend/events.c
index 9dbd7774..7094ac0d 100644
--- a/src/cmd/isula/extend/events.c
+++ b/src/cmd/isula/extend/events.c
@@ -214,12 +214,12 @@ int cmd_events_main(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_events_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_events_desc,
g_cmd_events_usage);
if (command_parse_args(&cmd, &g_cmd_events_args.argc, &g_cmd_events_args.argv)) {
exit(EINVALIDARGS);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("Events: log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/extend/stats.c b/src/cmd/isula/extend/stats.c
index 655332b8..334f859e 100644
--- a/src/cmd/isula/extend/stats.c
+++ b/src/cmd/isula/extend/stats.c
@@ -272,9 +272,9 @@ int cmd_stats_main(int argc, const char **argv)
exit(ECOMMON);
}
g_cmd_stats_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_stats_desc,
g_cmd_stats_usage);
- isula_libutils_default_log_config(argv[0], &lconf);
if (command_parse_args(&cmd, &g_cmd_stats_args.argc, &g_cmd_stats_args.argv)) {
exit(EINVALIDARGS);
}
diff --git a/src/cmd/isula/extend/update.c b/src/cmd/isula/extend/update.c
index da472b0b..42cb8f21 100644
--- a/src/cmd/isula/extend/update.c
+++ b/src/cmd/isula/extend/update.c
@@ -149,12 +149,12 @@ int cmd_update_main(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_update_args)
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_update_args)) {
COMMAND_ERROR("client arguments init failed\n");
exit(ECOMMON);
}
g_cmd_update_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_update_desc,
g_cmd_update_usage);
if (command_parse_args(&cmd, &g_cmd_update_args.argc, &g_cmd_update_args.argv) ||
diff --git a/src/cmd/isula/images/images.c b/src/cmd/isula/images/images.c
index f60e7500..3d538aa5 100644
--- a/src/cmd/isula/images/images.c
+++ b/src/cmd/isula/images/images.c
@@ -324,12 +324,12 @@ int cmd_images_main(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_images_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_images_desc,
g_cmd_images_usage);
if (command_parse_args(&cmd, &g_cmd_images_args.argc, &g_cmd_images_args.argv)) {
exit(exit_code);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("Images: log init failed");
exit(exit_code);
diff --git a/src/cmd/isula/images/import.c b/src/cmd/isula/images/import.c
index 2dcc6486..dbacb604 100644
--- a/src/cmd/isula/images/import.c
+++ b/src/cmd/isula/images/import.c
@@ -88,12 +88,12 @@ int cmd_import_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_import_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_import_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_import_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_import_desc,
g_cmd_import_usage);
if (command_parse_args(&cmd, &g_cmd_import_args.argc, &g_cmd_import_args.argv)) {
diff --git a/src/cmd/isula/images/load.c b/src/cmd/isula/images/load.c
index 0fb8014e..688edd02 100644
--- a/src/cmd/isula/images/load.c
+++ b/src/cmd/isula/images/load.c
@@ -124,12 +124,12 @@ int cmd_load_main(int argc, const char **argv)
#endif
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_load_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_load_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_load_desc,
g_cmd_load_usage);
if (command_parse_args(&cmd, &g_cmd_load_args.argc, &g_cmd_load_args.argv)) {
diff --git a/src/cmd/isula/images/login.c b/src/cmd/isula/images/login.c
index 92550352..0c0c149b 100644
--- a/src/cmd/isula/images/login.c
+++ b/src/cmd/isula/images/login.c
@@ -184,13 +184,13 @@ int cmd_login_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { COMMON_OPTIONS(g_cmd_login_args) LOGIN_OPTIONS(g_cmd_login_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_login_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_login_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_login_desc,
g_cmd_login_usage);
if (command_parse_args(&cmd, &g_cmd_login_args.argc, &g_cmd_login_args.argv)) {
diff --git a/src/cmd/isula/images/logout.c b/src/cmd/isula/images/logout.c
index 8efec1e3..45f28509 100644
--- a/src/cmd/isula/images/logout.c
+++ b/src/cmd/isula/images/logout.c
@@ -80,13 +80,13 @@ int cmd_logout_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { COMMON_OPTIONS(g_cmd_logout_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_logout_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_logout_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_logout_desc,
g_cmd_logout_usage);
if (command_parse_args(&cmd, &g_cmd_logout_args.argc, &g_cmd_logout_args.argv)) {
diff --git a/src/cmd/isula/images/pull.c b/src/cmd/isula/images/pull.c
index b72b0302..3ba7a715 100644
--- a/src/cmd/isula/images/pull.c
+++ b/src/cmd/isula/images/pull.c
@@ -79,13 +79,13 @@ int cmd_pull_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { COMMON_OPTIONS(g_cmd_pull_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_pull_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_pull_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_pull_desc,
g_cmd_pull_usage);
if (command_parse_args(&cmd, &g_cmd_pull_args.argc, &g_cmd_pull_args.argv)) {
diff --git a/src/cmd/isula/images/rmi.c b/src/cmd/isula/images/rmi.c
index 53ea7343..5b07c866 100644
--- a/src/cmd/isula/images/rmi.c
+++ b/src/cmd/isula/images/rmi.c
@@ -83,12 +83,12 @@ int cmd_rmi_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_rmi_args) RMI_OPTIONS(g_cmd_rmi_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_rmi_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_rmi_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_rmi_desc,
g_cmd_rmi_usage);
if (command_parse_args(&cmd, &g_cmd_rmi_args.argc, &g_cmd_rmi_args.argv)) {
diff --git a/src/cmd/isula/images/tag.c b/src/cmd/isula/images/tag.c
index e5a86708..8f399520 100644
--- a/src/cmd/isula/images/tag.c
+++ b/src/cmd/isula/images/tag.c
@@ -78,12 +78,12 @@ int cmd_tag_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_tag_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_tag_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_tag_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_tag_desc,
g_cmd_tag_usage);
if (command_parse_args(&cmd, &g_cmd_tag_args.argc, &g_cmd_tag_args.argv)) {
diff --git a/src/cmd/isula/information/info.c b/src/cmd/isula/information/info.c
index d6f6f7be..d3dd194a 100644
--- a/src/cmd/isula/information/info.c
+++ b/src/cmd/isula/information/info.c
@@ -160,12 +160,12 @@ int cmd_info_main(int argc, const char **argv)
g_cmd_info_args.progname = argv[0];
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_info_args) };
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_info_desc,
g_cmd_info_usage);
if (command_parse_args(&cmd, &g_cmd_info_args.argc, &g_cmd_info_args.argv) != 0) {
exit(EINVALIDARGS);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf) != 0) {
COMMAND_ERROR("Info: log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/information/inspect.c b/src/cmd/isula/information/inspect.c
index 8ddb032e..d575b3db 100644
--- a/src/cmd/isula/information/inspect.c
+++ b/src/cmd/isula/information/inspect.c
@@ -967,12 +967,12 @@ int cmd_inspect_main(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_inspect_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_inspect_desc,
g_cmd_inspect_usage);
if (command_parse_args(&cmd, &g_cmd_inspect_args.argc, &g_cmd_inspect_args.argv)) {
exit(EINVALIDARGS);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/information/logs.c b/src/cmd/isula/information/logs.c
index 2ddd16e6..5f3951ed 100644
--- a/src/cmd/isula/information/logs.c
+++ b/src/cmd/isula/information/logs.c
@@ -109,12 +109,12 @@ static int cmd_logs_init(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_logs_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_logs_desc,
g_cmd_logs_usage);
if (command_parse_args(&cmd, &g_cmd_logs_args.argc, &g_cmd_logs_args.argv)) {
return EINVALIDARGS;
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("log init failed\n");
g_cmd_logs_args.name = g_cmd_logs_args.argv[0];
diff --git a/src/cmd/isula/information/ps.c b/src/cmd/isula/information/ps.c
index 125353a6..e1f8f75a 100644
--- a/src/cmd/isula/information/ps.c
+++ b/src/cmd/isula/information/ps.c
@@ -986,12 +986,12 @@ int cmd_list_main(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_list_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_list_desc,
g_cmd_list_usage);
if (command_parse_args(&cmd, &g_cmd_list_args.argc, &g_cmd_list_args.argv)) {
exit(EINVALIDARGS);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("PS: log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/information/top.c b/src/cmd/isula/information/top.c
index 5d0e3f0f..eeb47892 100644
--- a/src/cmd/isula/information/top.c
+++ b/src/cmd/isula/information/top.c
@@ -120,12 +120,12 @@ int cmd_top_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_top_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_top_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_top_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_top_desc,
g_cmd_top_usage);
diff --git a/src/cmd/isula/information/version.c b/src/cmd/isula/information/version.c
index 62ee5643..46f73cab 100644
--- a/src/cmd/isula/information/version.c
+++ b/src/cmd/isula/information/version.c
@@ -98,12 +98,12 @@ int cmd_version_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_version_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_version_args)) {
COMMAND_ERROR("client arguments init failed\n");
exit(ECOMMON);
}
g_cmd_version_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_version_desc,
g_cmd_version_usage);
if (command_parse_args(&cmd, &g_cmd_version_args.argc, &g_cmd_version_args.argv)) {
diff --git a/src/cmd/isula/information/wait.c b/src/cmd/isula/information/wait.c
index b39c4953..aaa8f20e 100644
--- a/src/cmd/isula/information/wait.c
+++ b/src/cmd/isula/information/wait.c
@@ -91,12 +91,12 @@ int cmd_wait_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_wait_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_wait_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_wait_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_wait_desc,
g_cmd_wait_usage);
if (command_parse_args(&cmd, &g_cmd_wait_args.argc, &g_cmd_wait_args.argv)) {
diff --git a/src/cmd/isula/stream/attach.c b/src/cmd/isula/stream/attach.c
index f0a77a16..6dac2a0c 100644
--- a/src/cmd/isula/stream/attach.c
+++ b/src/cmd/isula/stream/attach.c
@@ -172,12 +172,12 @@ static int attach_cmd_init(int argc, const char **argv)
g_cmd_attach_args.progname = argv[0];
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_attach_args) };
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_attach_desc,
g_cmd_attach_usage);
if (command_parse_args(&cmd, &g_cmd_attach_args.argc, &g_cmd_attach_args.argv)) {
return EINVALIDARGS;
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("log init failed");
return ECOMMON;
diff --git a/src/cmd/isula/stream/cp.c b/src/cmd/isula/stream/cp.c
index e954ed3d..b869741f 100644
--- a/src/cmd/isula/stream/cp.c
+++ b/src/cmd/isula/stream/cp.c
@@ -327,12 +327,12 @@ int cmd_cp_main(int argc, const char **argv)
g_cmd_cp_args.progname = argv[0];
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_cp_args) };
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_cp_desc,
g_cmd_cp_usage);
if (command_parse_args(&cmd, &g_cmd_cp_args.argc, &g_cmd_cp_args.argv)) {
exit(EINVALIDARGS);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("cp: log init failed");
exit(ECOMMON);
diff --git a/src/cmd/isula/stream/exec.c b/src/cmd/isula/stream/exec.c
index 559a9d0f..d1d57268 100644
--- a/src/cmd/isula/stream/exec.c
+++ b/src/cmd/isula/stream/exec.c
@@ -198,12 +198,12 @@ static int exec_cmd_init(int argc, const char **argv)
EXEC_OPTIONS(g_cmd_exec_args)
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_exec_args)) {
COMMAND_ERROR("client arguments init failed\n");
exit(ECOMMON);
}
g_cmd_exec_args.progname = argv[0];
+ isula_libutils_default_log_config(argv[0], &lconf);
command_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_exec_desc,
g_cmd_exec_usage);
diff --git a/src/cmd/isula/volume/list.c b/src/cmd/isula/volume/list.c
index f58abc0f..23fe2027 100644
--- a/src/cmd/isula/volume/list.c
+++ b/src/cmd/isula/volume/list.c
@@ -145,12 +145,12 @@ int cmd_volume_ls_main(int argc, const char **argv)
COMMON_OPTIONS(g_cmd_volume_ls_args)
};
+ isula_libutils_default_log_config(argv[0], &lconf);
subcommand_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_volume_ls_desc,
g_cmd_volume_ls_usage);
if (command_parse_args(&cmd, &g_cmd_volume_ls_args.argc, &g_cmd_volume_ls_args.argv)) {
exit(exit_code);
}
- isula_libutils_default_log_config(argv[0], &lconf);
if (isula_libutils_log_enable(&lconf)) {
COMMAND_ERROR("volume ls: log init failed");
exit(exit_code);
diff --git a/src/cmd/isula/volume/prune.c b/src/cmd/isula/volume/prune.c
index e9d628d1..2a3bca3e 100644
--- a/src/cmd/isula/volume/prune.c
+++ b/src/cmd/isula/volume/prune.c
@@ -90,12 +90,12 @@ int cmd_volume_prune_main(int argc, const char **argv)
PRUNE_OPTIONS(g_cmd_volume_prune_args)
};
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_volume_prune_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_volume_prune_args.progname = util_string_join(" ", argv, 2);
+ isula_libutils_default_log_config(argv[0], &lconf);
subcommand_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_volume_prune_desc,
g_cmd_volume_prune_usage);
diff --git a/src/cmd/isula/volume/remove.c b/src/cmd/isula/volume/remove.c
index 2d10a002..71194722 100644
--- a/src/cmd/isula/volume/remove.c
+++ b/src/cmd/isula/volume/remove.c
@@ -80,12 +80,12 @@ int cmd_volume_rm_main(int argc, const char **argv)
command_t cmd;
struct command_option options[] = { LOG_OPTIONS(lconf) COMMON_OPTIONS(g_cmd_volume_rm_args) };
- isula_libutils_default_log_config(argv[0], &lconf);
if (client_arguments_init(&g_cmd_volume_rm_args)) {
COMMAND_ERROR("client arguments init failed");
exit(ECOMMON);
}
g_cmd_volume_rm_args.progname = util_string_join(" ", argv, 2);
+ isula_libutils_default_log_config(argv[0], &lconf);
subcommand_init(&cmd, options, sizeof(options) / sizeof(options[0]), argc, (const char **)argv, g_cmd_volume_rm_desc,
g_cmd_volume_rm_usage);
if (command_parse_args(&cmd, &g_cmd_volume_rm_args.argc, &g_cmd_volume_rm_args.argv)) {
--
2.25.1
Reference in New Issue View Git Blame Copy Permalink