* [PATCH 03/29] admin: get rid of singleton $CFG var
2019-11-15 9:50 5% [PATCH 00/29] speed up tests by preloading Eric Wong
@ 2019-11-15 9:50 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-11-15 9:50 UTC (permalink / raw)
To: meta
PublicInbox::Admin::config() just adds an extra layer of
indirection which we barely rely on. So get rid of this
global variable and make it easier to run tests in the
future without relying on global state.
---
lib/PublicInbox/Admin.pm | 9 +++------
script/public-inbox-edit | 7 +++----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index d2a0d06b..dddeeae9 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -9,7 +9,6 @@ use warnings;
use Cwd 'abs_path';
use base qw(Exporter);
our @EXPORT_OK = qw(resolve_repo_dir);
-my $CFG; # all the admin stuff is a singleton
require PublicInbox::Config;
sub resolve_repo_dir {
@@ -80,14 +79,12 @@ sub unconfigured_ibx ($$) {
});
}
-sub config () { $CFG //= eval { PublicInbox::Config->new } }
-
-sub resolve_inboxes ($;$) {
- my ($argv, $opt) = @_;
+sub resolve_inboxes ($;$$) {
+ my ($argv, $opt, $cfg) = @_;
require PublicInbox::Inbox;
$opt ||= {};
- my $cfg = config();
+ $cfg //= eval { PublicInbox::Config->new };
if ($opt->{all}) {
my $cfgfile = PublicInbox::Config::default_file();
$cfg or die "--all specified, but $cfgfile not readable\n";
diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index 0accd7c1..b437b3c0 100755
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -22,12 +22,11 @@ my @opt = qw(mid|m=s file|F=s raw);
GetOptions($opt, @PublicInbox::AdminEdit::OPT, @opt) or
die "bad command-line args\n$usage\n";
+my $cfg = eval { PublicInbox::Config->new };
my $editor = $ENV{MAIL_EDITOR}; # e.g. "mutt -f"
unless (defined $editor) {
my $k = 'publicinbox.mailEditor';
- if (my $cfg = PublicInbox::Admin::config()) {
- $editor = $cfg->{lc($k)};
- }
+ $editor = $cfg->{lc($k)} if $cfg;
unless (defined $editor) {
warn "\`$k' not configured, trying \`git var GIT_EDITOR'\n";
chomp($editor = `git var GIT_EDITOR`);
@@ -41,7 +40,7 @@ if (defined $mid && defined $file) {
die "the --mid and --file options are mutually exclusive\n";
}
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt);
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt, $cfg);
PublicInbox::AdminEdit::check_editable(\@ibxs);
my $found = {}; # cid => [ [ibx, smsg] [, [ibx, smsg] ] ]
^ permalink raw reply related [relevance 7%]
* [PATCH 00/29] speed up tests by preloading
@ 2019-11-15 9:50 5% Eric Wong
2019-11-15 9:50 7% ` [PATCH 03/29] admin: get rid of singleton $CFG var Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-11-15 9:50 UTC (permalink / raw)
To: meta
On my fastest system, this brings "make check" time down from
~17s to ~10s. This also improves consistency of our test suite,
adds ENV{TAIL} support to all daemons, and removes the test-time
dependency on the IPC::Run module.
Several cleanups were necessary to limit the scope of some
references and minor bugs were found (and fixed) in preparation
for this. Most of the changes were to explicitly pass global
variables into subs to avoid warnings.
TEST_RUN_MODE=0 can be set in the environment to restore
real-world behavior with (v)fork && execve.
Eric Wong (29):
edit: pass global variables into subs
edit: use OO API of File::Temp to shorten lifetime
admin: get rid of singleton $CFG var
index: pass global variables into subs
init: pass global variables into subs
mda: pass global variables into subs
learn: pass global variables into subs
inboxwritable: add ->cleanup method
import: only pass Inbox object to SearchIdx->new
xapcmd: do not fire END and DESTROY handlers in child
spawn: which: allow embedded slash for relative path
t/common: introduce run_script wrapper for t/cgi.t
t/edit: switch to use run_script
t/init: convert to using run_script
t/purge: convert to run_script
t/v2mirror: get rid of IPC::Run dependency
t/mda: switch to run_script for testing
t/mda_filter_rubylang: drop IPC::Run dependency
doc: remove IPC::Run as a dev and test dependency
t/v2mirror: switch to default run_mode for speedup
t/convert-compact: convert to run_script
t/httpd: use run_script for -init
t/watch_maildir_v2: use run_script for -init
t/nntpd: use run_script for -init
t/watch_filter_rubylang: run_script for -init and -index
t/v2mda: switch to run_script in many places
t/indexlevels-mirror*: switch to run_script
t/xcpdb-reshard: use run_script for -xcpdb
t/common: start_script replaces spawn_listener
INSTALL | 4 -
ci/deps.perl | 1 -
lib/PublicInbox/Admin.pm | 9 +-
lib/PublicInbox/Import.pm | 4 +-
lib/PublicInbox/InboxWritable.pm | 4 +
lib/PublicInbox/Spawn.pm | 2 +-
lib/PublicInbox/Xapcmd.pm | 5 +-
script/public-inbox-edit | 40 ++---
script/public-inbox-index | 3 +-
script/public-inbox-init | 27 +++-
script/public-inbox-learn | 8 +-
script/public-inbox-mda | 12 +-
t/cgi.t | 16 +-
t/common.perl | 248 ++++++++++++++++++++++++++++---
t/convert-compact.t | 18 +--
t/edit.t | 65 ++++----
t/git-http-backend.t | 14 +-
t/httpd-corner.t | 48 +++---
t/httpd-https.t | 28 +---
t/httpd-unix.t | 47 +++---
t/httpd.t | 18 +--
t/indexlevels-mirror.t | 24 +--
t/init.t | 85 +++++------
t/mda.t | 53 ++++---
t/mda_filter_rubylang.t | 17 +--
t/nntpd-tls.t | 29 +---
t/nntpd-validate.t | 27 ++--
t/nntpd.t | 22 ++-
t/perf-nntpd.t | 22 ++-
t/purge.t | 20 +--
t/v2mda.t | 38 ++---
t/v2mirror.t | 55 +++----
t/v2writable.t | 8 +-
t/watch_filter_rubylang.t | 6 +-
t/watch_maildir_v2.t | 4 +-
t/www_listing.t | 8 +-
t/xcpdb-reshard.t | 5 +-
37 files changed, 584 insertions(+), 460 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-11-15 9:50 5% [PATCH 00/29] speed up tests by preloading Eric Wong
2019-11-15 9:50 7% ` [PATCH 03/29] admin: get rid of singleton $CFG var Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).