From bc283e0e6924d83044f6cbb8e3ad5e35c29a8c3d Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Fri, 2 Jun 2017 16:54:38 +0530 Subject: logger: improve logging at server side Change-Id: I7a2f8804b7d33c58101bbfb58dcff15370239311 Signed-off-by: Prasanna Kumar Kalever --- rpc/block_svc_routines.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- utils/utils.h | 18 +++++----------- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/rpc/block_svc_routines.c b/rpc/block_svc_routines.c index a6a7974..b1197c1 100644 --- a/rpc/block_svc_routines.c +++ b/rpc/block_svc_routines.c @@ -1373,6 +1373,10 @@ block_modify_cli_1_svc(blockModifyCli *blk, struct svc_req *rqstp) char *errMsg = NULL; + LOG("mgmt", GB_LOG_DEBUG, + "modify cli request, volume=%s blockname=%s authmode=%d", + blk->volume, blk->block_name, blk->auth_mode); + if ((GB_ALLOC(reply) < 0) || (GB_ALLOC(savereply) < 0) || (GB_ALLOC (info) < 0)) { GB_FREE (reply); @@ -1671,6 +1675,11 @@ block_create_cli_1_svc(blockCreateCli *blk, struct svc_req *rqstp) char *errMsg = NULL; + LOG("mgmt", GB_LOG_INFO, + "create cli request, volume=%s blockname=%s mpath=%d blockhosts=%s " + "authmode=%d size=%lu", blk->volume, blk->block_name, blk->mpath, + blk->block_hosts, blk->auth_mode, blk->size); + if (GB_ALLOC(reply) < 0) { return NULL; } @@ -1833,6 +1842,11 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp) size_t i; + LOG("mgmt", GB_LOG_INFO, + "create request, volume=%s blockname=%s blockhosts=%s filename=%s authmode=%d " + "passwd=%s size=%lu", blk->volume, blk->block_name, blk->block_hosts, + blk->gbid, blk->auth_mode, blk->auth_mode?blk->passwd:"", blk->size); + if (GB_ALLOC(reply) < 0) { goto out; } @@ -1942,6 +1956,8 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp) GB_FREE(lun); } + LOG("mgmt", GB_LOG_DEBUG, "command, %s", exec); + if (GB_ALLOC_N(reply->out, 4096) < 0) { GB_FREE(reply); goto out; @@ -1964,6 +1980,9 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp) blk->block_name, blk->volume, exec, strerror(errno)); } + LOG("mgmt", GB_LOG_DEBUG, "raw output, %s", reply->out); + LOG("mgmt", GB_LOG_INFO, "command exit code, %d", reply->exit); + out: GB_FREE(exec); GB_FREE(authcred); @@ -2053,6 +2072,10 @@ block_delete_cli_1_svc(blockDeleteCli *blk, struct svc_req *rqstp) char *errMsg = NULL; int errCode = 0; + + LOG("mgmt", GB_LOG_INFO, "delete cli request, volume=%s blockname=%s", + blk->volume, blk->block_name); + if (GB_ALLOC(reply) < 0) { return NULL; } @@ -2135,6 +2158,9 @@ block_delete_1_svc(blockDelete *blk, struct svc_req *rqstp) blockResponse *reply = NULL; + LOG("mgmt", GB_LOG_INFO, + "delete request, blockname=%s filename=%s", blk->block_name, blk->gbid); + if (GB_ALLOC(reply) < 0) { goto out; } @@ -2180,6 +2206,8 @@ block_delete_1_svc(blockDelete *blk, struct svc_req *rqstp) goto out; } + LOG("mgmt", GB_LOG_DEBUG, "command, %s", exec); + if (GB_ALLOC_N(reply->out, 4096) < 0) { GB_FREE(reply); goto out; @@ -2202,6 +2230,9 @@ block_delete_1_svc(blockDelete *blk, struct svc_req *rqstp) blk->block_name, exec, strerror(errno)); } + LOG("mgmt", GB_LOG_DEBUG, "raw output, %s", reply->out); + LOG("mgmt", GB_LOG_INFO, "command exit code, %d", reply->exit); + out: GB_FREE(exec); GB_FREE(backstore); @@ -2226,6 +2257,11 @@ block_modify_1_svc(blockModify *blk, struct svc_req *rqstp) char *tmp = NULL; + LOG("mgmt", GB_LOG_INFO, + "modify request, volume=%s blockname=%s filename=%s authmode=%d passwd=%s", + blk->volume, blk->block_name, blk->gbid, blk->auth_mode, + blk->auth_mode?blk->passwd:""); + if (GB_ALLOC(reply) < 0) { return NULL; } @@ -2339,7 +2375,9 @@ block_modify_1_svc(blockModify *blk, struct svc_req *rqstp) if (GB_ASPRINTF(&exec, "%s && %s", tmp, GB_TGCLI_SAVE) == -1) { goto out; } - /* free(tmp) happens at out: */ + + LOG("mgmt", GB_LOG_DEBUG, "command, %s", exec); + if (GB_ALLOC_N(reply->out, 4096) < 0) { GB_FREE(reply); @@ -2362,6 +2400,9 @@ block_modify_1_svc(blockModify *blk, struct svc_req *rqstp) /* command execution success */ reply->exit = 0; + LOG("mgmt", GB_LOG_DEBUG, "raw output, %s", reply->out); + LOG("mgmt", GB_LOG_INFO, "command exit code, %d", reply->exit); + out: GB_FREE(tmp); GB_FREE(exec); @@ -2388,6 +2429,8 @@ block_list_cli_1_svc(blockListCli *blk, struct svc_req *rqstp) char *errMsg = NULL; + LOG("mgmt", GB_LOG_DEBUG, "list cli request, volume=%s", blk->volume); + if (GB_ALLOC(reply) < 0) { return NULL; } @@ -2445,6 +2488,8 @@ block_list_cli_1_svc(blockListCli *blk, struct svc_req *rqstp) errCode = 0; + LOG("mgmt", GB_LOG_DEBUG, "list cli success, volume=%s", blk->volume); + if (blk->json_resp) { json_object_object_add(json_obj, "blocks", json_array); } @@ -2610,6 +2655,9 @@ block_info_cli_1_svc(blockInfoCli *blk, struct svc_req *rqstp) char *errMsg = NULL; + LOG("mgmt", GB_LOG_DEBUG, + "info cli request, volume=%s blockname=%s", blk->volume, blk->block_name); + if ((GB_ALLOC(reply) < 0) || (GB_ALLOC(info) < 0)) { GB_FREE (reply); GB_FREE (info); @@ -2645,6 +2693,9 @@ block_info_cli_1_svc(blockInfoCli *blk, struct svc_req *rqstp) goto out; } + LOG("mgmt", GB_LOG_DEBUG, + "info cli success, volume=%s blockname=%s", blk->volume, blk->block_name); + out: GB_METAUNLOCK(lkfd, blk->volume, ret, errMsg); diff --git a/utils/utils.h b/utils/utils.h index db24833..4a544ef 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -269,27 +269,19 @@ static const char *const gbDaemonCmdlineOptLookup[] = { typedef enum LogLevel { GB_LOG_NONE = 0, - GB_LOG_EMERGENCY = 1, - GB_LOG_ALERT = 2, - GB_LOG_CRITICAL = 3, - GB_LOG_ERROR = 4, - GB_LOG_WARNING = 5, - GB_LOG_NOTICE = 6, - GB_LOG_INFO = 7, - GB_LOG_DEBUG = 8, - GB_LOG_TRACE = 9, + GB_LOG_ERROR = 1, + GB_LOG_WARNING = 2, + GB_LOG_INFO = 3, + GB_LOG_DEBUG = 4, + GB_LOG_TRACE = 5, GB_LOG_MAX } LogLevel; static const char *const LogLevelLookup[] = { [GB_LOG_NONE] = "NONE", - [GB_LOG_EMERGENCY] = "EMERGENCY", - [GB_LOG_ALERT] = "ALERT", - [GB_LOG_CRITICAL] = "CRITICAL", [GB_LOG_ERROR] = "ERROR", [GB_LOG_WARNING] = "WARNING", - [GB_LOG_NOTICE] = "NOTICE", [GB_LOG_INFO] = "INFO", [GB_LOG_DEBUG] = "DEBUG", [GB_LOG_TRACE] = "TRACE", -- cgit