Skip to content

Run in foreground #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gitnatxo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Run in foreground #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eee7142
Update dinaip.pl
gitnatxo Jan 19, 2023
c5efcc3
Update Debug.pm
gitnatxo Jan 19, 2023
3986bbb
Update Demonio.pm
gitnatxo Jan 19, 2023
9726512
Updated README file
nsilla Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ Uso: dinaIP [OPCIONES] ...
- -l Muestra una lista de los dominios pertenecientes a esta cuenta
- -b Elimina una zona de la monitorizacion. Sintaxis: dominio:zona_a_eliminar
- -d Detiene el demonio de dinaIP
- -f Arranca el demonio de DinaIP en primer plano y enva logs al terminal
- -h Despliega esta ayuda
- -s Muestra el status del demonio de dinaIP.
27 changes: 18 additions & 9 deletions source/Debug.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,34 @@ use POSIX qw(strftime);
my $INICIADO = undef;
my $DEBUG = undef;

my $PRIMERPLANO = undef;

sub log{

&iniciar unless($INICIADO);
my $fecha = strftime ("%Y-%m-%d %H:%M:%S",localtime());
print $DEBUG "[$fecha] $_[0] \n";
&iniciar unless($INICIADO);

my $fecha = strftime ("%Y-%m-%d %H:%M:%S",localtime());
print $DEBUG "[$fecha] $_[0] \n";

}

sub iniciar{
if ($PRIMERPLANO == 1) {
open ($DEBUG, '>>', '/dev/stdin') ||
die($!);
} else {
open ($DEBUG, '>>', '/var/log/dinaip.log') ||
die($!);
}

open ($DEBUG, '>>', '/var/log/dinaip.log') ||
die($!);
$DEBUG->autoflush;

$DEBUG->autoflush;
$INICIADO = 1;
}

$INICIADO = 1;
sub setPrimerPlano{
$PRIMERPLANO = $_[0];
}


1;

29 changes: 15 additions & 14 deletions source/Demonio.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,26 @@ my $AVISO_RECARGA = undef;

sub iniciar{

&Debug::log('Iniciando proceso...');
&Debug::log('Iniciando proceso...');

my $proceso = $_[0];
my $frecuencia = $_[1] || $FRECUENCIA;

if(my $pid = &demonizar){
my $proceso = $_[0];
my $frecuencia = $_[1] || $FRECUENCIA;
my $primerPlano = $_[2] || 0;

open (F, '>', $RUTA_PID);
print F $pid;
close F;
if(!$primerPlano && (my $pid = &demonizar)){

exit(0);
}
else{
open (F, '>', $RUTA_PID);
print F $pid;
close F;

&setDemonioCorriendo;
exit(0);
}
else{

&procesar;
}
&setDemonioCorriendo;

&procesar;
}
}

sub procesar{
Expand Down
10 changes: 8 additions & 2 deletions source/dinaip.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ sub BEGIN {

use strict;
use Comando;
use Debug;
use Demonio;
use ConfiguracionDinapiIp;
use Proceso;
Expand All @@ -27,12 +28,16 @@ sub BEGIN {

my %opciones;

getopts('isdhla:b:u:p:', \%opciones);
getopts('isfdhla:b:u:p:', \%opciones);

unless(keys(%opciones)){
&ayuda();
}

if(exists($opciones{f})){
&Debug::setPrimerPlano(1);
}

# autentificamos primero si nos pasan usuario
if(exists($opciones{u})){
if(exists($opciones{p})){
Expand Down Expand Up @@ -91,7 +96,7 @@ sub iniciar{

&Demonio::iniciar(sub {
&Proceso::run(@_);
}, $configuracion->frecuencia);
}, $configuracion->frecuencia, exists($opciones{f}));
}

sub pedirCredenciales{
Expand Down Expand Up @@ -383,6 +388,7 @@ sub eliminarZona{
-l Muestra una lista de los dominios pertenecientes a esta cuenta
-b Elimina una zona de la monitorización. Sintaxis: dominio:zona_a_eliminar
-d Detiene el demonio de DinaIP
-f Arranca el demonio de DinaIP en primer plano y enva logs al terminal
-h Despliega esta ayuda
-s Muestra el status del demonio de DinaIP.

Expand Down