pvereport: add missing newline for style

[pve-manager.git] / bin / pvedaemon

diff --git a/bin/pvedaemon b/bin/pvedaemon
index 243282c2ed188590c51039b75ef62607e06819a3..ffccb34fb9cc2d52f249ff9e43037d8918abbe39 100755 (executable)
--- a/bin/pvedaemon
+++ b/bin/pvedaemon
@@ -1,124 +1,27 @@
-#!/usr/bin/perl -T -w
+#!/usr/bin/perl -T
 
 $ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
 
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};  
 
 use strict;
-use Getopt::Long;
-use POSIX ":sys_wait_h";
-use Socket;
-use PVE::SafeSyslog;
-# use PVE::Config; # fixme
-use PVE::APIDaemon;
-
-my $pidfile = "/var/run/pvedaemon.pid";
-my $opt_debug;
+use warnings;
 
-initlog ('pvedaemon');
-
-if (!GetOptions ('debug' => \$opt_debug)) {
-    die "usage: $0 [--debug]\n";
-}
+use PVE::SafeSyslog;
+use PVE::Service::pvedaemon;
 
 $SIG{'__WARN__'} = sub {
     my $err = $@;
     my $t = $_[0];
     chomp $t;
-    syslog('warning', "WARNING: %s", $t);
+    print STDERR "$t\n";
+    syslog('warning', "%s", $t);
     $@ = $err;
 };
 
-$0 = "pvedaemon";
-
-PVE::APIDaemon::enable_debug() if $opt_debug;
-
-# create dir for dtach sockets
-mkdir "/var/run/dtach";
-
-my $cpid;
-my $daemon;
-eval {
-    $daemon = PVE::APIDaemon->new(
-       LocalAddr => "127.0.0.1",
-        LocalPort => 85,
-        Listen => SOMAXCONN,
-        ReuseAddr => 1,
-       );
+my $prepare = sub {
+    # create dir for dtach sockets
+    mkdir "/var/run/dtach";
 };
 
-my $err = $@;
-
-if ($err) {
-    syslog ('err' , "unable to start server: $err");
-    print STDERR $err;
-    exit (-1);
-}
-
-if ($opt_debug || !($cpid = fork ())) {
-
-    $SIG{PIPE} = 'IGNORE';
-    $SIG{INT} = 'IGNORE' if !$opt_debug;
-
-    $SIG{TERM} = $SIG{QUIT} = sub { 
-       syslog ('info' , "server closing");
-
-       $SIG{INT} = 'DEFAULT';
-
-       unlink "$pidfile";
-
-       exit (0);
-    };
-
-    syslog ('info' , "starting server");
-
-    if (!$opt_debug) {
-       # redirect STDIN/STDOUT/SDTERR to /dev/null
-       open STDIN,  '</dev/null' || die "can't read /dev/null  [$!]";
-       open STDOUT, '>/dev/null' || die "can't write /dev/null [$!]";
-       open STDERR, '>&STDOUT' || die "can't open STDERR to STDOUT [$!]";
-    }
-
-    POSIX::setsid(); 
-
-    system ("echo > /var/lib/pve-manager/vmops"); # init vmops file
-
-    eval {
-       $daemon->start_server();
-    };
-    my $err = $@;
-
-    if ($err) {
-       syslog ('err' , "unexpected server error: $err");
-       print STDERR $err if $opt_debug;
-       exit (-1);
-    }
-
-} else {
-
-    open (PIDFILE, ">$pidfile") || 
-       die "cant write '$pidfile' - $! :ERROR";
-    print PIDFILE "$cpid\n";
-    close (PIDFILE) || 
-       die "cant write '$pidfile' - $! :ERROR";
-}
-
-exit (0);
-
-__END__
-
-=head1 NAME
-                                          
-pvedaemon - the PVE configuration server
-
-=head1 SYNOPSIS
-
-pvedaemon [--debug]
-
-=head1 DESCRIPTION
-
-All configuration is done using this Server. The Server only
-listens to a local address 127.0.0.1 port 85 for security
-reasons.
-
-
+PVE::Service::pvedaemon->run_cli_handler(prepare => $prepare);