Skip to content

Add warning if environment variable is not set and improve logging #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robsketch merged 2 commits into from
Dec 4, 2024
Merged

Add warning if environment variable is not set and improve logging #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d3dca9
Add warning if environment variable is not set and improve logging
robsketch Dec 4, 2024
9b660d6
Remove rmvr common file as the functions are defined in main torq script
robsketch Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions code/common/rmvr.q
View file
Open in desktop

This file was deleted.

14 changes: 10 additions & 4 deletions torq.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ exitifnull:{[variable]
\d .rmvr

removeenvvar:{
// positions of {}
// positions of {}
pos:ss[x]each"{}";
// check the formatting is ok
$[0=count first pos; :x;
Expand All @@ -310,7 +310,13 @@ removeenvvar:{
()];

// cut out each environment variable, and retrieve the meaning
raze {$["{"=first x;getenv`$1 _ -1 _ x;x]}each (raze flip 0 1+pos) cut x}
// ascertain if string is an env var by checking if first char is a {
raze {$["{"~first x;resolveandcheckenvvar[x];x]}each (raze flip 0 1+pos) cut x}

resolveandcheckenvvar:{[s]
ev:getenv[`$1 _ -1 _ s];
if[""~ev;.lg.w[`resolveandcheckenvvar;"warning, could not resolve environment variable: ",s]];
ev}

// Process initialisation
\d .proc
Expand Down Expand Up @@ -426,14 +432,14 @@ readprocfile:{[file]
.err.ex[`readprocfile;"Current host does not match host specified in ",string[file],". Parameters are host: ", string[output`host], ", port: ", string[output`port], ", proctype: ", string[output`proctype], ", procname: ",string output`procname;1]];
// exit if no port passed via command line or specified in config
if[null[output`port]&0i=system"p";
.err.ex[`readprocfile;"No port passed via -p flag or found in ",string[file],". Parameters are host: ", string[output`host], ", proctype: ", string[output`proctype], ", procname: ",string output`procname;1]];
.err.ex[`readprocfile;"No port number passed via -p flag or no port number found in ",string[file],". Parameters are host: ", string[output`host], ", proctype: ", string[output`proctype], ", procname: ",string output`procname;1]];
// .finspace.enabled flag here is a temporarily bug fix for Finspace DEV clusters - port is set later so is empty when we reach this point. AWS investigating
if[not[.finspace.enabled]&not[output[`port] = system"p"]& 0i = system"p";
@[system;"p ",string[output[`port]];.err.ex[`readprocfile;"failed to set port to ",string[output[`port]]]];
.lg.o[`readprocfile;"port set to ",string[output[`port]]]
];
output
}
}

.lg.o[`init;"attempting to read required process parameters ",("," sv string req)," from file ",string file];
// Read in the file, pull out the rows which are applicable and set the local variables
Expand Down