On May 15, 2024 12:32 pm, Aaron Lauterer wrote:
> The first instance had the line break mid array. It now is a bit over
> the limit, but follows the style guide closely: putting each argument to
> the function in a newline.
>
> Signed-off-by: Aaron Lauterer <a.laute...@proxmox.com>
> ---
> src/PVE/CLI/pvecm.pm | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/src/PVE/CLI/pvecm.pm b/src/PVE/CLI/pvecm.pm
> index 5c285a9..53e9cac 100755
> --- a/src/PVE/CLI/pvecm.pm
> +++ b/src/PVE/CLI/pvecm.pm
> @@ -210,10 +210,10 @@ __PACKAGE__->register_method ({
> my ($node, $ip) = @_;
> my $ssh_options = PVE::SSHInfo::ssh_info_to_ssh_opts ({ ip => $ip,
> name => $node });
> my $outsub = sub { print "\nnode '$node': " . shift };
> - run_command([
> - @$ssh_cmd, @$ssh_options, $ip, "$qdevice_certutil", "-m",
> "-c",
> - "/etc/pve/$p12_file_base"], outfunc => \&$outsub
> - );
> + run_command(
> + [@$ssh_cmd, @$ssh_options, $ip, "$qdevice_certutil", "-m",
> "-c", "/etc/pve/$p12_file_base"],
> + outfunc => \&$outsub
this would then be even shorter if the options can be dropped
altogether. and while we are at it:
outfunc => $outsub
no need for symbol salad here :)
I don't mind the arg-per-line even if it would be below the limit then,
but as an alternative, you can always construct the full command first
to make the run_command line shorter.
e.g.:
my $cluster_ssh_cmd = PVE::SSHInfo::ssh_info_to_command({ ip => $ip, name =>
$node });
my $cmd = [@$cluster_ssh_cmd, '--', $qdevice_certutil, '-m', '-c',
"/etc/pve/$p12_file_base"];
run_command($cmd, outfunc => $outsub);
but that is mainly a matter of taste I'd say.
> + );
> });
> unlink "/etc/pve/$p12_file_base";
>
> @@ -249,8 +249,14 @@ __PACKAGE__->register_method ({
> my $ssh_options = PVE::SSHInfo::ssh_info_to_ssh_opts ({ ip => $ip,
> name => $node });
> my $outsub = sub { print "\nnode '$node': " . shift };
> print "\nINFO: start and enable corosync qdevice daemon on node
> '$node'...\n";
> - run_command([@$ssh_cmd, @$ssh_options, $ip, 'systemctl', 'start',
> 'corosync-qdevice'], outfunc => \&$outsub);
> - run_command([@$ssh_cmd, @$ssh_options, $ip, 'systemctl', 'enable',
> 'corosync-qdevice'], outfunc => \&$outsub);
> + run_command(
> + [@$ssh_cmd, @$ssh_options, $ip, 'systemctl', 'start',
> 'corosync-qdevice'],
> + outfunc => \&$outsub
> + );
> + run_command(
> + [@$ssh_cmd, @$ssh_options, $ip, 'systemctl', 'enable',
> 'corosync-qdevice'],
> + outfunc => \&$outsub
> + );
same as above applies here as well
> });
>
> run_command(['corosync-cfgtool', '-R']); # do cluster wide config reload
> --
> 2.39.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
