f5823c94c6
- Sort options helpers and add pkg-help to describe options better - Add CGIWRAPPER option which when turned off will turn off packaging of the setuid cgi-wrapper(1) binary - Cleanup post-patch; use LOCALBASE where appropriate - Drop incidental variables - Do not install useless documentation; README.md is a copy of pkg-descr; ChangeLog does not contain any juicy information either - Trim pkg-message further
45 lines
1.2 KiB
C
45 lines
1.2 KiB
C
--- src/hiawatha.c.orig 2018-09-16 08:22:32 UTC
|
|
+++ src/hiawatha.c
|
|
@@ -156,8 +156,12 @@ void task_runner(t_config *config) {
|
|
int delay = 0;
|
|
time_t now;
|
|
#ifdef ENABLE_LOADCHECK
|
|
+#ifdef HAVE_GETLOADAVG
|
|
+ double loadavg[1];
|
|
+#else
|
|
FILE *load_fp = NULL;
|
|
char load_str[50], *c;
|
|
+#endif
|
|
#ifdef ENABLE_MONITOR
|
|
int load_monitor_timer = 0;
|
|
#endif
|
|
@@ -228,6 +232,21 @@ void task_runner(t_config *config) {
|
|
|
|
#ifdef ENABLE_LOADCHECK
|
|
if (config->max_server_load > 0) {
|
|
+#ifdef HAVE_GETLOADAVG
|
|
+ if (getloadavg(loadavg, 1) >= 1) {
|
|
+ current_server_load = loadavg[0];
|
|
+#ifdef ENABLE_MONITOR
|
|
+ if (config->monitor_enabled) {
|
|
+ if ((current_server_load > config->max_server_load) && (load_monitor_timer == 0)) {
|
|
+ monitor_event("High server load (%0.2f)", current_server_load);
|
|
+ load_monitor_timer = 60;
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+ } else {
|
|
+ current_server_load = 0;
|
|
+ }
|
|
+#else
|
|
if ((load_fp = fopen("/proc/loadavg", "r")) != NULL) {
|
|
if (fgets(load_str, 49, load_fp) != NULL) {
|
|
load_str[49] = '\0';
|
|
@@ -253,6 +272,7 @@ void task_runner(t_config *config) {
|
|
} else {
|
|
current_server_load = 0;
|
|
}
|
|
+#endif
|
|
|
|
#ifdef ENABLE_MONITOR
|
|
if (load_monitor_timer > 0) {
|