135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure internal plugin asciibetical load order is preserved

Browse Source
This commit is contained in:
Oliver Gorwits
2023-09-27 14:13:40 +01:00
parent 582163aa3e
commit 3a160206a1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/Worker/Loader.pm
View File

@@ -49,7 +49,9 @@ sub load_workers {
and exists vars->{'workers'}->{'internal'}->{$phase}; and exists vars->{'workers'}->{'internal'}->{$phase};
my $internal = vars->{'workers'}->{'internal'}; my $internal = vars->{'workers'}->{'internal'};
foreach my $namespace (keys %{ $internal->{$phase} }) { # the namespace of an internal worker is actually the worker name so must
# be sorted in order to "preserve" the plugin load order
foreach my $namespace (sort keys %{ $internal->{$phase} }) {
foreach my $priority (keys %{ $internal->{$phase}->{$namespace} }) { foreach my $priority (keys %{ $internal->{$phase}->{$namespace} }) {
push @{ $workers->{$phase}->{'__internal__'}->{$priority} }, push @{ $workers->{$phase}->{'__internal__'}->{$priority} },
@{ $internal->{$phase}->{$namespace}->{$priority} }; @{ $internal->{$phase}->{$namespace}->{$priority} };

2
lib/App/Netdisco/Worker/Plugin.pm
View File

@@ -108,7 +108,7 @@ register 'register_worker' => sub {
push @{ vars->{'workers'}->{$workerconf->{action}} push @{ vars->{'workers'}->{$workerconf->{action}}
->{$workerconf->{phase}} ->{$workerconf->{phase}}
->{$workerconf->{namespace}} ->{$workerconf->{namespace}}
->{$workerconf->{priority}} }, $worker; ->{$workerconf->{priority}} }, { conf => $workerconf, go => $worker };
}; };
sub _find_matchaction { sub _find_matchaction {