Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,16 +371,14 @@ Memory tracking is turned on by default now, you can run server with memory trac
./arkouda_server --memTrack=false
```

By default, the server listens on port `5555` and prints verbose output. These options can be changed with command-line
flags `--ServerPort=1234` and `--v=false`
By default, the server listens on port `5555`. This value can be overridden with the command-line flag
`--ServerPort=1234`

Memory tracking is turned on by default and turned off by using the `--memTrack=false` flag

Logging messages are turned on by default and turned off by using the `--logging=false` flag
Trace logging messages are turned on by default and turned off by using the `--trace=false` flag

Verbose messages at the debug level are turned off by default and are turned on by using the `--v` flag

Other command line options are available, view them by using the `--help` flag
Other command line options are available and can be viewed by using the `--help` flag

```bash
./arkouda-server --help
Expand Down
6 changes: 3 additions & 3 deletions src/ServerConfig.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ module ServerConfig
use Logging;

/*
Logging flag
Trace logging flag
*/
config const logging = true;
config const trace = true;

/*
Verbose debug flag
Expand Down Expand Up @@ -148,7 +148,7 @@ module ServerConfig
if (memTrack) {
// this is a per locale total
var total = memoryUsed() + (additionalAmount:uint / numLocales:uint);
if (logging) {
if (trace) {
if (total > memHighWater) {
memHighWater = total;
scLogger.info(getModuleName(),getRoutineName(),getLineNumber(),
Expand Down
14 changes: 7 additions & 7 deletions src/arkouda_server.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ proc main() {
*/
proc sendRepMsg(repMsg: ?t) where t==string || t==bytes {
repCount += 1;
if logging {
if trace {
if t==bytes {
asLogger.info(getModuleName(),getRoutineName(),getLineNumber(),
"repMsg: <binary-data>");
Expand Down Expand Up @@ -191,7 +191,7 @@ proc main() {
authenticateUser(token);
}

if (logging) {
if (trace) {
try {
if (cmd != "array") {
asLogger.info(getModuleName(), getRoutineName(), getLineNumber(),
Expand All @@ -209,7 +209,7 @@ proc main() {
// If cmd is shutdown, don't bother generating a repMsg
if cmd == "shutdown" {
shutdown();
if (logging) {
if (trace) {
asLogger.info(getModuleName(),getRoutineName(),getLineNumber(),
"<<< shutdown took %.17r sec".format(t1.elapsed() - s0));
}
Expand Down Expand Up @@ -333,23 +333,23 @@ proc main() {
* log that the request message has been handled and reply message has been sent along with
* the time to do so
*/
if logging {
if trace {
asLogger.info(getModuleName(),getRoutineName(),getLineNumber(),
"<<< %s took %.17r sec".format(cmd, t1.elapsed() - s0));
}
if (logging && memTrack) {
if (trace && memTrack) {
asLogger.info(getModuleName(),getRoutineName(),getLineNumber(),
"bytes of memory used after command %t".format(memoryUsed():uint * numLocales:uint));
}
} catch (e: ErrorWithMsg) {
sendRepMsg(e.msg);
if logging {
if trace {
asLogger.error(getModuleName(),getRoutineName(),getLineNumber(),
"<<< %s resulted in error %s in %.17r sec".format(cmd, e.msg, t1.elapsed() - s0));
}
} catch (e: Error) {
sendRepMsg(unknownError(e.message()));
if logging {
if trace {
asLogger.error(getModuleName(), getRoutineName(), getLineNumber(),
"<<< %s resulted in error: %s in %.17r sec".format(cmd, e.message(),t1.elapsed() - s0));
}
Expand Down
2 changes: 1 addition & 1 deletion test/COMPOPTS
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SRC_DIR=$(cd $ARKOUDA_HOME && make print-ARKOUDA_SOURCE_DIR)
# Location of the configuration file, so we always include it and disable extra
# debugging that might make noise in the tests
CONFIG_FILE="${SRC_DIR}/ServerConfig.chpl"
CONFIG_OPTS="${CONFIG_FILE} -sv=false -slogging=false"
CONFIG_OPTS="${CONFIG_FILE} -sv=false -strace=false"

TEST_OPTS="-sprintTimes=false -sprintDiags=false -sprintDiagsSum=false"

Expand Down
2 changes: 1 addition & 1 deletion util/test/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def start_arkouda_server(numlocales, verbose=False, log=False, port=5555, host=N
os.remove(connection_file)

cmd = [get_arkouda_server(),
'--logging={}'.format('true' if log else 'false'),
'--trace={}'.format('true' if log else 'false'),
'--v={}'.format('true' if verbose else 'false'),
'--serverConnectionInfo={}'.format(connection_file),
'-nl {}'.format(numlocales), '--ServerPort={}'.format(port)]
Expand Down