about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-01-12 21:17:48 +0000
committerEric Wong <e@yhbt.net>2020-01-13 23:21:21 +0000
commitf0da3ed7de7ad6b8edfa9f1c4242747d6a864a23 (patch)
tree2f871b54ef145a00af63cf3fdde6e113ae816e07
parent7669985165b5dacb60902406f2b5a894506bdc45 (diff)
downloadpublic-inbox-f0da3ed7de7ad6b8edfa9f1c4242747d6a864a23.tar.gz
Inbox.pm accessing the $in_loop variable directly raises
warnings when Inbox is loaded without DS.
-rw-r--r--lib/PublicInbox/DS.pm2
-rw-r--r--lib/PublicInbox/Inbox.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index fe794512..b441adc9 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -255,6 +255,8 @@ sub reap_pids {
 # reentrant SIGCHLD handler (since reap_pids is not reentrant)
 sub enqueue_reap ($) { push @$nextq, \&reap_pids };
 
+sub in_loop () { $in_loop }
+
 sub EpollEventLoop {
     local $in_loop = 1;
     do {
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index ff800965..e834d565 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -52,7 +52,7 @@ sub cleanup_task () {
 sub cleanup_possible () {
         # no need to require DS, here, if it were enabled another
         # module would've require'd it, already
-        eval { $PublicInbox::DS::in_loop } or return 0;
+        eval { PublicInbox::DS::in_loop() } or return 0;
 
         eval {
                 require Devel::Peek; # needs separate package in Fedora