proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-10-04 16:24:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

status/plugin: extend send/_connect/_disconnect/test_connection

Browse Source 
by providing the id or cfg to have better context in those methods
we will need that for influxdb http api

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-12-02 10:21:07 +01:00 committed by Thomas Lamprecht
parent 161d904f13
commit fa97819773
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/ExtMetric.pm
View File

@ -49,7 +49,7 @@ sub transactions_start {
foreach_plug($cfg, sub { foreach_plug($cfg, sub {
my ($plugin, $id, $plugin_config) = @_; my ($plugin, $id, $plugin_config) = @_;
my $connection = $plugin->_connect($plugin_config); my $connection = $plugin->_connect($plugin_config, $id);
push @$transactions, { push @$transactions, {
connection => $connection, connection => $connection,
@ -72,7 +72,7 @@ sub transactions_finish {
my $flush_err = $@; my $flush_err = $@;
warn "$flush_err" if $flush_err; warn "$flush_err" if $flush_err;
$plugin->_disconnect($txn->{connection}); $plugin->_disconnect($txn->{connection}, $txn->{cfg});
$txn->{connection} = undef; $txn->{connection} = undef;
# avoid log spam, already got a send error; disconnect would fail too # avoid log spam, already got a send error; disconnect would fail too
warn "disconnect failed: $@" if $@ && !$flush_err; warn "disconnect failed: $@" if $@ && !$flush_err;

14
PVE/Status/Plugin.pm
View File

@ -70,12 +70,12 @@ sub parse_section_header {
} }
sub _connect { sub _connect {
my ($class, $cfg) = @_; my ($class, $cfg, $id) = @_;
die "please implement inside plugin"; die "please implement inside plugin";
} }
sub _disconnect { sub _disconnect {
my ($class, $connection) = @_; my ($class, $connection, $cfg) = @_;
$connection->close(); # overwrite if not a simple socket $connection->close(); # overwrite if not a simple socket
} }
@ -115,25 +115,25 @@ sub flush_data {
return if !defined($txn->{data}) || $txn->{data} eq ''; return if !defined($txn->{data}) || $txn->{data} eq '';
my $data = delete $txn->{data}; my $data = delete $txn->{data};
eval { $class->send($txn->{connection}, $data) }; eval { $class->send($txn->{connection}, $data, $txn->{cfg}) };
die "metrics send error '$txn->{id}': $@" if $@; die "metrics send error '$txn->{id}': $@" if $@;
} }
sub send { sub send {
my ($class, $connection, $data) = @_; my ($class, $connection, $data, $cfg) = @_;
defined($connection->send($data)) defined($connection->send($data))
or die "failed to send metrics: $!\n"; or die "failed to send metrics: $!\n";
} }
sub test_connection { sub test_connection {
my ($class, $cfg) = @_; my ($class, $cfg, $id) = @_;
# do not check connection for disabled plugins # do not check connection for disabled plugins
return if $cfg->{disable}; return if $cfg->{disable};
my $conn = $class->_connect($cfg); my $conn = $class->_connect($cfg, $id);
$class->_disconnect($conn); $class->_disconnect($conn, $cfg);
} }
sub update_node_status { sub update_node_status {