Fixed a bug with the eiger monochromator not driving mt when mcv did not drive
Fixed expression searching in sicslogquery Added proton monitot to tasscan output Chnaged SICS scripts to reflect the switch from TRICS to ZEBRA
This commit is contained in:
@@ -132,7 +132,7 @@ int sicslogQuery(int argc, char *argv[], ResultCallback_t func, void *userData)
|
||||
case 'h':
|
||||
snprintf(
|
||||
lastError,sizeof(lastError),
|
||||
"Options: -s subsystem\n-l last(h,d)\n-f fromtime\n-t totime\n-i instrument\n-c severity\n%s",
|
||||
"Options: \n-s subsystem\n-l last(h,d)\n-f fromtime\n-t totime\n-i instrument\n-c severity\n%s",
|
||||
"-e search-expression");
|
||||
return 1;
|
||||
break;
|
||||
@@ -166,7 +166,7 @@ int sicslogQuery(int argc, char *argv[], ResultCallback_t func, void *userData)
|
||||
strncat(jsonQuery,subQuery,sizeof(jsonQuery));
|
||||
}
|
||||
if(exp != NULL){
|
||||
snprintf(subQuery,sizeof(subQuery),", \"message\" : {$regexp : \"/%s/\" }", exp);
|
||||
snprintf(subQuery,sizeof(subQuery),", \"message\" : {\"$regex\": \"%s\" }", exp);
|
||||
strncat(jsonQuery,subQuery,sizeof(jsonQuery));
|
||||
}
|
||||
strncat(jsonQuery,"}",sizeof(jsonQuery));
|
||||
|
||||
Reference in New Issue
Block a user