diff options
| author | zhanghongqing <[email protected]> | 2024-03-11 18:49:05 +0800 |
|---|---|---|
| committer | zhanghongqing <[email protected]> | 2024-03-11 18:49:05 +0800 |
| commit | 0c8aac7c47092f348840e8dabfd43ef57e189c47 (patch) | |
| tree | 54106e1e24770e5bce275dcb7de5ba77473bc265 | |
| parent | 34035abfcbe2dd85faffa808fd25b34866378f21 (diff) | |
[修改][定位库] 适配TSG 2402定位库perl脚本mmdb-perl.pl变量命名
| -rw-r--r-- | galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java | 2 | ||||
| -rw-r--r-- | galaxy-job-executor/src/main/resources/plugins/mmdb/tsg/mmdb-perl.pl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java index 1768ec4..7aa5670 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java @@ -195,8 +195,8 @@ public class LogStorageQuotaJob { } String queryTablesSql = "{\"query\":\"SELECT DISTINCT(datasource) FROM sys.tasks WHERE datasource NOT LIKE '%hot%' " + deletionConfig.getNotInSql("datasource", deletionConfig.getAnalyticExclusion()) + " \",\"context\":{\"skipEmptyBuckets\":\"false\"},\"resultFormat\":\"object\"}"; - modifyLastStorage(Constant.ZK_REPORT_AND_METRICS, Integer.valueOf(String.valueOf(paramsMap.get(max_days)))); deleteDruidTable(queryTablesSql, Integer.valueOf(String.valueOf(paramsMap.get(max_days))), false); + modifyLastStorage(Constant.ZK_REPORT_AND_METRICS, Integer.valueOf(String.valueOf(paramsMap.get(max_days)))); } catch (BusinessException be) { logger.error(be.getMessage()); diff --git a/galaxy-job-executor/src/main/resources/plugins/mmdb/tsg/mmdb-perl.pl b/galaxy-job-executor/src/main/resources/plugins/mmdb/tsg/mmdb-perl.pl index 023664a..d6ddc62 100644 --- a/galaxy-job-executor/src/main/resources/plugins/mmdb/tsg/mmdb-perl.pl +++ b/galaxy-job-executor/src/main/resources/plugins/mmdb/tsg/mmdb-perl.pl @@ -11,8 +11,8 @@ binmode(STDIN,":encoding(gbk)"); ###################连接信息################### -my $serverHost="{{ cm_mariadb_host }}"; -my $token="{{ cm_server_token }}"; +my $serverHost="{{ cm_api }}"; +my $token="{{ cm_api_token }}"; #自定义：0. 内置：1 my @args = @ARGV; @@ -121,7 +121,7 @@ my $statusJson = encode_json \%statusHash; open my $statusFile, '>', $mmdbStatus; print $statusFile $statusJson; -my $gmtDateLog = strftime "%Y-%m-%d %H:%M:%S", gmtimvim m e; +my $gmtDateLog = strftime "%Y-%m-%d %H:%M:%S", gmtime; print MMDBLOG "$gmtDateLog MMDB IP Write Over. \n\n"; close(MMDBLOG); print "The perl script is finished!\n"; |