From d34c4e2b2f79ea22e883d8c7d17624b05ba2bc3f Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Tue, 9 Mar 2021 22:24:27 -0500 Subject: [PATCH] rename zssbackground to stcbackground Signed-off-by: Nakul Manchanda --- build/build_zss.sh | 2 +- c/datasetService.c | 8 ++++---- c/zss.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/build_zss.sh b/build/build_zss.sh index eba85f5c6..0ab05a83f 100755 --- a/build/build_zss.sh +++ b/build/build_zss.sh @@ -111,7 +111,7 @@ if c89 \ ${COMMON}/jwt/rscrypto/rs_rsclibc.c \ ${COMMON}/c/scheduling.c \ ${COMMON}/c/datasetlock.c \ - ${COMMON}/c/zssbackground.c \ + ${COMMON}/c/stcbackground.c \ ${COMMON}/c/signalcontrol.c \ ${COMMON}/c/socketmgmt.c \ ${COMMON}/c/stcbase.c \ diff --git a/c/datasetService.c b/c/datasetService.c index 7f8462ee0..79328dedb 100644 --- a/c/datasetService.c +++ b/c/datasetService.c @@ -296,13 +296,13 @@ static void readDatasetSettings(int* heartbeat, int* expiry) { *expiry = 0; } *heartbeat = jsonObjectGetNumber(datasetLockSettings, "ZSS_DATASET_HEARTBEAT"); - zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO,"heartbeat_loop_time %d\n", *heartbeat); + zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_DEBUG,"heartbeat_loop_time %d\n", *heartbeat); *expiry = jsonObjectGetNumber(datasetLockSettings, "ZSS_DATASET_EXPIRY"); - zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO,"heartbeat_expiry_time %d\n", *expiry); + zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_DEBUG,"heartbeat_expiry_time %d\n", *expiry); } static int serveDatasetHeartbeat(HttpService *service, HttpResponse *response){ - zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, "begin %s\n", __FUNCTION__); + zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_DEBUG2, "begin %s\n", __FUNCTION__); HttpRequest *request = response->request; if (!strcmp(request->method, methodPOST)) { resetTimeInHbt(request->username); @@ -331,7 +331,7 @@ void installDatasetHeartbeatService(HttpServer *server) { //initialize lock tables initLockResources(heartbeat, expiry); // register background handler - addZssBackgroudTask(&heartbeatBackgroundHandler,"DATASET_HEARTBEAT_TASK", lockService->heartbeat); + addStcBackgroudTask(&heartbeatBackgroundHandler,"DATASET_HEARTBEAT_TASK", lockService->heartbeat); } #endif /* __ZOWE_OS_ZOS */ diff --git a/c/zss.c b/c/zss.c index c6aa60764..e0bfc9032 100644 --- a/c/zss.c +++ b/c/zss.c @@ -62,7 +62,7 @@ #include "plugins.h" #ifdef __ZOWE_OS_ZOS #include "datasetjson.h" -#include "zssbackground.h" +#include "stcbackground.h" #include "authService.h" #include "securityService.h" #include "zis/client.h" @@ -398,15 +398,15 @@ static void initZssBackgroundTasks(HttpServer *server) { STCBase *base = server->base; stcRegisterModule( base, - STC_MODULE_ZSS, + STC_MODULE_BACKGROUND, server, NULL, NULL, NULL, - processZssBackgroundHandler + processStcBackgroundHandler ); - for(int i=0; i < N_TASK_TABLE_ENTRIES; i++) { + for (int i = 0; i < N_TASK_TABLE_ENTRIES; i++) { task_list[i].id = 0; /* initialise */ } }; @@ -1075,7 +1075,7 @@ int initializeJwtKeystoreIfConfigured(JsonObject *const serverConfig, ZOWE_LOG_SEVERE, ZSS_LOG_JWT_KEYSTORE_NAME_MSG); return 1; - } else if(tokenLabel == NULL){ + } else if (tokenLabel == NULL){ zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_SEVERE,