When trying to acquire the detail file lock, sleep more time than rlm_detail

so that we let rlm_detail win. This should probably at least improve the
locking problems reported.

diff --git a/src/main/radrelay.c b/src/main/radrelay.c
index d112129..36b5b00 100644 (file)
--- a/src/main/radrelay.c
+++ b/src/main/radrelay.c
@@ -239,8 +239,8 @@ int read_one(FILE *fp, struct relay_request *r_req)
        do {
                x = rad_lockfd_nonblock(fileno(fp), 0);
                if (x == -1)
-                       ms_sleep(25);
-       } while (x == -1 && i++ < 80);
+                       ms_sleep(100);
+       } while (x == -1 && i++ < 20);
 
        if (x == -1)
                return 0;

diff --git a/src/main/radsqlrelay.c b/src/main/radsqlrelay.c
index e457064..08b8f41 100644 (file)
--- a/src/main/radsqlrelay.c
+++ b/src/main/radsqlrelay.c
@@ -216,8 +216,8 @@ int read_one(FILE *fp, struct relay_request *r_req)
        do {
                x = rad_lockfd_nonblock(fileno(fp), 0);
                if (x == -1)
-                       ms_sleep(25);
-       } while (x == -1 && i++ < 80);
+                       ms_sleep(100);
+       } while (x == -1 && i++ < 20);
 
        if (x == -1)
                return 0;