has $db :reader;
has $db_needs_update :writer = 1;
has $mpd :reader;
+has $mpd_connected = 0;
+has $playlist_needs_filling = 1;
+has $quit_requested = 0;
+has $reload_requested = 0;
has $idler;
-has $work_queue = App::MPD::Feeder::WorkQueue->new;
has $last_mpd_comm;
+has $reconnect_delay = 5;
use constant DEFAULT_CONFIG_FILE => '/etc/mpd-feeder/mpd-feeder.conf';
ADJUST {
Getopt::Long::Configure('pass_through');
- Getopt::Long::GetOptions('cfg|config=s' => \$cfg_file);
+ Getopt::Long::GetOptions( 'cfg|config=s' => \$cfg_file );
Getopt::Long::Configure('no_pass_through');
$cfg_file //= DEFAULT_CONFIG_FILE if -e DEFAULT_CONFIG_FILE;
$opt = $new_opt;
+ $reconnect_delay = $opt->initial_reconnect_delay;
+
$db = App::MPD::Feeder::DB->new( opt => $opt );
}
-method connect_mpd {
+method init_mpd {
return if $mpd;
- my %conn = ( auto_connect => 1 );
+ my %conn = ( auto_connect => 0 );
$conn{host} = $opt->mpd_host if $opt->mpd_host;
$conn{port} = $opt->mpd_port if $opt->mpd_port;
$mpd->on(
close => sub {
- die "Connection to MPD lost";
+ $mpd->loop->stop('disconnected');
+ $mpd_connected = 0;
+ $log->warn("Connection to MPD lost");
}
);
$mpd->on(
playlist => sub {
- $work_queue->add('playlist');
+ $playlist_needs_filling = 1;
}
);
$mpd->on(
database => sub {
- $work_queue->add('database');
+ $db_needs_update = 1;
}
);
my $int_signal_handler = sub {
state $signal_count = 0;
$signal_count++;
- $log->debug("Signal received. Stopping loop");
- $work_queue->add('quit');
- $self->break_idle;
if ( $signal_count > 1 ) {
$log->warn("Another signal received (#$signal_count)");
$log->warn("Exiting abruptly");
exit 2;
}
+
+ $log->debug("Signal received. Stopping loop");
+ $quit_requested = 1;
+ $mpd->loop->stop('quit');
+ $self->break_idle;
};
for (qw(TERM INT)) {
name => 'HUP',
on_receipt => sub {
$log->debug("SIGHUP received. Scheduling reload");
- $work_queue->add('reload');
+ $reload_requested = 1;
+ $mpd->loop->stop('reload');
$self->break_idle;
},
)
IO::Async::Signal->new(
name => 'USR1',
on_receipt => sub {
- $log->debug("SIGUSR1 received. Dumping configuration to STDERR");
+ $log->debug(
+ "SIGUSR1 received. Dumping configuration to STDERR");
my $old = select \*STDERR;
try {
$opt->dump;
method connect_db {
$db->connect($opt);
- $self->update_db;
}
-method update_db($force = undef) {
- if (!$db_needs_update and !$force) {
+method update_db( $force = undef ) {
+ if ( !$db_needs_update and !$force ) {
$log->debug("Skipping DB update");
return;
}
$log->info('Updating song database');
- $self->connect_mpd;
my $rows = $mpd->send('listallinfo')->get;
}
}
-method queue_songs($num = undef) {
- $self->connect_db;
- if (!defined $num) {
- $self->connect_mpd;
+method queue_songs( $num = undef ) {
+ if ( !defined $num ) {
+ return unless $playlist_needs_filling;
+
$log->trace("Requesting playlist");
my $present = $mpd->send('playlist')->get // [];
$present = scalar(@$present);
$log->notice( "Playlist contains $present songs. Wanted: "
. $opt->target_queue_length );
if ( $present < $opt->target_queue_length ) {
- $self->queue_songs(
- $opt->target_queue_length - $present );
+ $self->queue_songs( $opt->target_queue_length - $present );
+ }
+ else {
+ $playlist_needs_filling = 0;
}
return;
}
$log->debug( "Adding " . join( ', ', map {"«$_»"} @paths ) );
+
# MPD needs raw bytes
utf8::encode($_) for @paths;
my @commands;
for (@paths) {
push @commands, [ add => "\"$_\"" ];
}
- $self->connect_mpd;
my $f = $mpd->send( \@commands );
$f->on_fail( sub { die @_ } );
$f->on_done(
sub {
$self->db->note_song_qeued($_) for @list;
+ $playlist_needs_filling = 0;
}
);
$f->get;
}
-method stop {
- undef $mpd;
-
+method reexec {
+ $log->notice("disconnecting and re-starting");
$db->disconnect;
-}
+ undef $mpd;
-method handle_work_queue {
- while ( my $item = $work_queue->next ) {
- if ( $item eq 'playlist' ) {
- $self->queue_songs;
- }
- elsif ( $item eq 'database' ) {
- $db_needs_update = 1;
- $self->update_db;
- }
- elsif ( $item eq 'reload' ) {
- $log->notice("disconnecting and re-starting");
- $self->stop;
-
- my @exec =
- ( $0, '--config', $self->cfg_file, '--skip-db-update' );
- if ( $log->is_trace ) {
- $log->trace( 'exec '
- . join( ' ', map { /\s/ ? "'$_'" : $_ } @exec ) );
- }
- exec(@exec);
- }
- elsif ( $item eq 'quit' ) {
- $log->trace("quitting");
- $self->stop;
- exit 0;
- }
- else {
- die "Unknown work queue item '$item'";
- }
+ my @exec = ( $0, '--config', $self->cfg_file, '--skip-db-update' );
+ if ( $log->is_trace ) {
+ $log->trace( 'exec ' . join( ' ', map { /\s/ ? "'$_'" : $_ } @exec ) );
}
+ exec(@exec);
}
method break_idle {
- if ($idler && !$idler->is_ready) {
+ if ( $idler && !$idler->is_ready ) {
$log->trace("hand-sending 'noidle'");
undef $idler;
- $mpd->{mpd_handle}->write("noidle\n");;
+ $mpd->{mpd_handle}->write("noidle\n");
}
else {
$log->trace("no idler found");
}
}
+method sleep_before_reconnection {
+ $self->debug( "Waiting for "
+ . duration_exact($reconnect_delay)
+ . " before re-connecting" );
+
+ $mpd->loop->add(
+ IO::Async::Timer::Countdown->new(
+ delay => $reconnect_delay,
+ on_expire => sub { $mpd->loop->stop },
+ )->start
+ );
+
+ $reconnect_delay = $reconnect_delay * 1.5;
+ $reconnect_delay = 120 if $reconnect_delay > 120;
+ $mpd->loop->run;
+}
+
+method pulse {
+ unless ($mpd_connected) {
+ $mpd->connect->then(
+ sub {
+ $mpd_connected = 1;
+ $playlist_needs_filling = 1;
+ $reconnect_delay = $opt->initial_reconnect_delay;
+ }
+ )->get;
+
+ $mpd->loop->later( sub { $self->pulse } );
+ return;
+ }
+
+ if ($db_needs_update) {
+ $self->update_db;
+ $mpd->loop->later( sub { $self->pulse } );
+ return;
+ }
+
+ if ($playlist_needs_filling) {
+ $self->queue_songs;
+ $mpd->loop->later( sub { $self->pulse } );
+ return;
+ }
+
+ $log->debug("Waiting idle. PID=$$");
+ $last_mpd_comm = time;
+ $idler = $mpd->send("idle database playlist");
+ my $result = $idler->get;
+ undef $idler;
+
+ if ( ref $result and $result->{changed} ) {
+ my $changed = $result->{changed};
+ $changed = [$changed] unless ref $changed;
+
+ $mpd->emit($_) for @$changed;
+ }
+
+ $log->trace('got out of idle');
+ $mpd->loop->stop;
+}
+
method run_loop {
- $self->connect_mpd;
$self->connect_db;
+ $self->init_mpd;
+
$mpd->loop->add(
IO::Async::Timer::Periodic->new(
interval => 60,
on_tick => sub {
+ if (!$mpd_connected) {
+ $log->trace("Not connected to MPD. Skipping alive check.");
+ return;
+ }
+
if ( time - $last_mpd_comm > 300 ) {
$log->trace(
- "no active MPD communication for more that 5 minutes"
- );
- $log->trace("forcing alive check");
+ "no active MPD communication for more that 5 minutes");
+ $log->debug("forcing alive check");
$self->break_idle;
}
else {
- $log->trace("contacted MPD less than 5 minutes ago. skipping alive check");
+ $log->trace(
+ "contacted MPD less than 5 minutes ago. skipping alive check"
+ );
}
},
)->start
);
- $self->queue_songs;
-
for ( ;; ) {
- $log->debug("Waiting idle. PID=$$");
- $last_mpd_comm = time;
- $idler = $mpd->send("idle database playlist");
- my $result = $idler->get;
- undef $idler;
+ $mpd->loop->later( sub { $self->pulse } );
- if ($result and $result->{changed}){
- my $changed = $result->{changed};
- $changed = [ $changed ] unless ref $changed;
-
- $mpd->emit($_) for @$changed;
- }
+ $log->trace('About to run the loop');
- $log->trace('got out of idle');
+ $mpd->loop->run;
- $self->handle_work_queue;
+ if ( $quit_requested ) {
+ $log->trace("about to quit");
+ undef $mpd;
+ $db->disconnect;
+ last;
+ }
+ elsif ( $reload_requested ) {
+ $self->reexec;
+ die "Not reached";
+ }
+ elsif ( !$mpd_connected ) {
+ $self->sleep_before_reconnection;
+ next;
+ }
}
}
projects / mpd-feeder.git / blobdiff