xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: restore Jenkinsfile2 and minor optimization

This commit is contained in:
kailixu 2024-12-03 19:10:05 +08:00
parent a26d5f5c8f
commit 6dcfe361fe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile2
View File

@ -505,7 +505,7 @@ pipeline {
}
}
stage('linux test') {
agent{label "slave1_47 || slave1_48 || slave1_49 || slave1_50 "}
agent{label "slave1_47 || slave1_48 || slave1_49 || slave1_50 || slave1_52 || slave1_59 || slave1_63 || worker03 || slave215 || slave217 || slave219 "}
options { skipDefaultCheckout() }
when {
changeRequest()

2
source/util/src/tlog.c
View File

@ -1198,7 +1198,7 @@ static void *taosAsyncOutputLog(void *param) {
break;
}
// process the log rotation every LOG_ROTATE_INTERVAL minutes
// process the log rotation every LOG_ROTATE_INTERVAL
int64_t curSec = taosGetTimestampMs() / 1000;
if (curSec >= lastCheckSec) {
if ((curSec - lastCheckSec) >= LOG_ROTATE_INTERVAL) {

2
source/util/src/tutil.c
View File

@ -543,7 +543,7 @@ bool tIsValidFileName(const char *fileName, const char *pattern) {
}
bool tIsValidFilePath(const char *filePath, const char *pattern) {
const char *filePathPattern = "^[a-zA-Z0-9/\\_.-]+$";
const char *filePathPattern = "^[a-zA-Z0-9:/\\_.-]+$";
return tIsValidFileName(filePath, pattern ? pattern : filePathPattern);
}