Skip to content

Commit

Permalink
Fixing Issue #298 - Timeout
Browse files Browse the repository at this point in the history
Odd Cacti log format issue when script server timeout happened
  • Loading branch information
TheWitness committed Jan 19, 2023
1 parent be2e2b7 commit 99897ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -6,6 +6,7 @@ The Cacti Group | spine
1.2.23
-issue#287: Unexpected reindexing occurs when using uptime as the reindex method
-issue#279: spine does not compile with SQL TLS deactivated
-issue#298: Odd Cacti log format issue when script server timeout happened
-feature#277: Spine should prevent the script server from connecting to remote when offline
-feature#292: Improve Script Server Timeout Logging
-feature#293: Add SQL_NO_CACHE to Spine Queries
Expand Down
4 changes: 3 additions & 1 deletion php.c
Expand Up @@ -241,7 +241,9 @@ char *php_readpipe(int php_process, char *command) {
php_init(php_process);
break;
case 0:
SPINE_LOG(("WARNING: SS[%i] The PHP Script Server did not respond in time for Timeout[%0.2f], Command[%s] and will therefore be restarted", php_process, end_time - start_time, command));
/* record end time */
end_time = get_time_as_double();
SPINE_LOG(("WARNING: SS[%i] The PHP Script Server did not respond in time for Timeout[%0.2f], Command[%s] and will therefore be restarted", php_process, end_time - begin_time, command));
SET_UNDEFINED(result_string);

/* kill script server because it is misbehaving */
Expand Down

0 comments on commit 99897ee

Please sign in to comment.