|
|
5b4e29 |
commit 4356ac909fa1cc30e5804d9ff6e4c9204977b091
|
|
|
5b4e29 |
Author: Nathan Scott <nathans@redhat.com>
|
|
|
5b4e29 |
Date: Fri Jan 31 14:34:25 2020 +1100
|
|
|
5b4e29 |
|
|
|
5b4e29 |
pmdactivemq: module name and path resolution fixes for latest perl
|
|
|
5b4e29 |
|
|
|
5b4e29 |
Picked up by test qa/760 with recent versions of perl.
|
|
|
5b4e29 |
|
|
|
5b4e29 |
Resolves Red Hat BZ #1788881
|
|
|
5b4e29 |
|
|
|
5b4e29 |
diff --git a/src/pmdas/activemq/GNUmakefile b/src/pmdas/activemq/GNUmakefile
|
|
|
5b4e29 |
index 8289670ca..1ad330220 100644
|
|
|
5b4e29 |
--- a/src/pmdas/activemq/GNUmakefile
|
|
|
5b4e29 |
+++ b/src/pmdas/activemq/GNUmakefile
|
|
|
5b4e29 |
@@ -41,7 +41,9 @@ build-me: check_domain
|
|
|
5b4e29 |
install install_pcp: default
|
|
|
5b4e29 |
$(INSTALL) -m 755 -d $(PMDADIR)
|
|
|
5b4e29 |
$(INSTALL) -m 755 Install Remove $(PMDADIR)
|
|
|
5b4e29 |
- $(INSTALL) -m 644 pmda$(IAM).pl $(MODULES) $(PMDADIR)
|
|
|
5b4e29 |
+ $(INSTALL) -m 644 pmda$(IAM).pl $(PMDADIR)/pmda$(IAM).pl
|
|
|
5b4e29 |
+ $(INSTALL) -m 755 -d $(PMDADIR)/PCP
|
|
|
5b4e29 |
+ $(INSTALL) -m 644 $(MODULES) $(PMDADIR)/PCP
|
|
|
5b4e29 |
@$(INSTALL_MAN)
|
|
|
5b4e29 |
else
|
|
|
5b4e29 |
build-me:
|
|
|
5b4e29 |
diff --git a/src/pmdas/activemq/pmdaactivemq.pl b/src/pmdas/activemq/pmdaactivemq.pl
|
|
|
5b4e29 |
index 7f835aac5..4b5451688 100755
|
|
|
5b4e29 |
--- a/src/pmdas/activemq/pmdaactivemq.pl
|
|
|
5b4e29 |
+++ b/src/pmdas/activemq/pmdaactivemq.pl
|
|
|
5b4e29 |
@@ -49,16 +49,16 @@ my $jvm_garbage_collection_cluster = 5;
|
|
|
5b4e29 |
for my $file (pmda_config('PCP_PMDAS_DIR') . '/activemq/activemq.conf', 'activemq.conf') {
|
|
|
5b4e29 |
eval `cat $file` unless ! -f $file;
|
|
|
5b4e29 |
}
|
|
|
5b4e29 |
-my $timesource = TimeSource->new;
|
|
|
5b4e29 |
-my $cache = Cache->new($timesource, $cache_time);
|
|
|
5b4e29 |
+my $timesource = PCP::TimeSource->new;
|
|
|
5b4e29 |
+my $cache = PCP::Cache->new($timesource, $cache_time);
|
|
|
5b4e29 |
my $http_client = LWP::UserAgent->new;
|
|
|
5b4e29 |
$http_client->agent('pmdaactivemq');
|
|
|
5b4e29 |
$http_client->timeout($rest_timeout);
|
|
|
5b4e29 |
-my $rest_client = RESTClient->new($http_client, $cache, $rest_hostname, $rest_port, $rest_username, $rest_password, $rest_realm);
|
|
|
5b4e29 |
-my $activemq = ActiveMQ->new($rest_client);
|
|
|
5b4e29 |
-my $jvm_memory = JVMMemory->new($rest_client);
|
|
|
5b4e29 |
-my $jvm_memory_pool = JVMMemoryPool->new($rest_client);
|
|
|
5b4e29 |
-my $jvm_garbage_collection = JVMGarbageCollection->new($rest_client);
|
|
|
5b4e29 |
+my $rest_client = PCP::RESTClient->new($http_client, $cache, $rest_hostname, $rest_port, $rest_username, $rest_password, $rest_realm);
|
|
|
5b4e29 |
+my $activemq = PCP::ActiveMQ->new($rest_client);
|
|
|
5b4e29 |
+my $jvm_memory = PCP::JVMMemory->new($rest_client);
|
|
|
5b4e29 |
+my $jvm_memory_pool = PCP::JVMMemoryPool->new($rest_client);
|
|
|
5b4e29 |
+my $jvm_garbage_collection = PCP::JVMGarbageCollection->new($rest_client);
|
|
|
5b4e29 |
|
|
|
5b4e29 |
my %queue_instances;
|
|
|
5b4e29 |
|