From 6fc21cac41e3b1bf4a6484fed736aec27b340b63 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 14 Feb 2022 21:41:32 +0100 Subject: Use correct base URL when running a command job (work/maintenance) --- lib/Travelynx.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm index b7284e4..8e29114 100755 --- a/lib/Travelynx.pm +++ b/lib/Travelynx.pm @@ -276,6 +276,17 @@ sub startup { } ); + $self->helper( + base_url_for => sub { + my ( $self, $path ) = @_; + if ( ( my $url = $self->url_for($path) )->base ne q{} ) { + return $url; + } + return $self->url_for($path) + ->base( $self->app->config->{base_url} ); + } + ); + $self->helper( hafas => sub { my ($self) = @_; @@ -284,7 +295,7 @@ sub startup { hafas_rest_api => $self->app->config->{backend}{hafas_rest_api}, main_cache => $self->app->cache_iris_main, realtime_cache => $self->app->cache_iris_rt, - root_url => $self->url_for('/')->to_abs, + root_url => $self->base_url_for('/')->to_abs, user_agent => $self->ua, version => $self->app->config->{version}, ); @@ -298,7 +309,7 @@ sub startup { log => $self->app->log, main_cache => $self->app->cache_iris_main, realtime_cache => $self->app->cache_iris_rt, - root_url => $self->url_for('/')->to_abs, + root_url => $self->base_url_for('/')->to_abs, version => $self->app->config->{version}, ); } @@ -317,7 +328,7 @@ sub startup { state $trwl_api = Travelynx::Helper::Traewelling->new( log => $self->app->log, model => $self->traewelling, - root_url => $self->url_for('/')->to_abs, + root_url => $self->base_url_for('/')->to_abs, user_agent => $self->ua, version => $self->app->config->{version}, ); @@ -406,7 +417,7 @@ sub startup { state $dbdb = Travelynx::Helper::DBDB->new( log => $self->app->log, cache => $self->app->cache_iris_main, - root_url => $self->url_for('/')->to_abs, + root_url => $self->base_url_for('/')->to_abs, user_agent => $self->ua, version => $self->app->config->{version}, ); -- cgit v1.2.3