Fork #405
Draft
Fork #405
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -49,7 +49,8 @@ void printErrorStream(const char *message) { _printErrorStreamPointer(message); | |||
|
|
|||
| void _printErrorStream(const char *pszMessage) { fprintf(stderr, "%s", pszMessage); } | |||
| void _printWarningStream(const char *pszMessage) { fprintf(stderr, "%s", pszMessage); } | |||
| void _printDebugStream(const char *pszMessage) { printf("%s", pszMessage); } | |||
| // void _printDebugStream(const char *pszMessage) { printf("%s", pszMessage); } | |||
| void _printDebugStream(const char *pszMessage) { fprintf(stderr, "%s", pszMessage); } | |||
There was a problem hiding this comment.
As discussed we can keep this as it was and create a forklogger function which logs to stderr. This can be set as functionpointer in setErrorFunction(serverErrorFunction), setWarningFunction(serverWarningFunction), and setDebugFunction(serverDebugFunction)
| ADAGUC_PATH=/adaguc/adaguc-server-master/, | ||
| ADAGUC_TMP=/tmp, | ||
| ADAGUC_CONFIG=/adaguc/adaguc-server-master/python/lib/adaguc/adaguc-server-config-python-postgres.xml | ||
| command=/adaguc/adaguc-server-master/bin/adagucserver |
There was a problem hiding this comment.
We need to discuss if it would be a good solution to start this executable once in the python code. The reasoning is that the python code has logic to calculate the environment variables like ADAGUC_ONLINERESOURCE and others.
python/lib/adaguc/CGIRunner.py
Outdated
| @@ -23,6 +24,94 @@ | |||
| sem = asyncio.Semaphore(int(ADAGUC_NUMPARALLELPROCESSES)) | |||
|
|
|||
|
|
|||
| ADAGUC_FORK_UNIX_SOCKET = f"{os.getenv('ADAGUC_PATH')}/adaguc.socket" | |||
There was a problem hiding this comment.
I think it would be good to be able to set the socket path with an absolute value so it does not have to be in the adaguc-server-master directory
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
$ADAGUC_PATH/adaguc.socketand listen for connections to the socket.fork()and handles the client request in the forked process. Python will write theQUERY_STRINGin the socket, and the forked adagucserver process will write it's stdout back via the socket to the python webserver (e.g. aGetMapwill result in adagucserver writing header+binary png data inside the socket).Info:
ldd ./bin/adagucserver | wc -lyields 103 entries. It could also be due to initialization code inside some of the .so files we link against.MEASURETIMEmacro. Look for the loglineReady!!!. Performing aGetMaprequest takes 150 ms according to adagucserver C++. However the same request results in the response headerx-process-timeset to 200 ms. There is about 50 ms overhead (this will depend on your system/OS).Issues to investigate:
/tmp/does not work in Docker.timeout=300should be configurable and should be used inside the "background thread that checks/cleans old processes".