Unverified Commit 8e2ecca2 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

DBDB: make proxy config accessible

parent 2bf15fd3

lib/Travelynx.pm

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ sub startup { 
			my ($self) = @_;

			state $dbdb = Travelynx::Helper::DBDB->new(

				log            => $self->app->log,

				dbris_config   => $self->app->config->{dbris},

				main_cache     => $self->app->cache_iris_main,

				realtime_cache => $self->app->cache_iris_rt,

				root_url       => $self->base_url_for('/')->to_abs,

lib/Travelynx/Helper/DBDB.pm

+4 −6
Original line number Diff line number Diff line
@@ -63,11 +63,10 @@ sub has_wagonorder_p { 


	my $agent = $self->{user_agent};

	my $proxy;

	if ( my @proxies = @{ $self->{service_config}{'bahn.de'}{proxies} // [] } )

	{

	if ( my @proxies = @{ $self->{dbris_config}{'bahn.de'}{proxies} // [] } ) {

		$proxy = $proxies[ int( rand( scalar @proxies ) ) ];

	}

	elsif ( my $p = $self->{service_config}{'bahn.de'}{proxy} ) {

	elsif ( my $p = $self->{dbris_config}{'bahn.de'}{proxy} ) {

		$proxy = $p;

	}
@@ -137,11 +136,10 @@ sub get_wagonorder_p { 


	my $agent = $self->{user_agent};

	my $proxy;

	if ( my @proxies = @{ $self->{service_config}{'bahn.de'}{proxies} // [] } )

	{

	if ( my @proxies = @{ $self->{dbris_config}{'bahn.de'}{proxies} // [] } ) {

		$proxy = $proxies[ int( rand( scalar @proxies ) ) ];

	}

	elsif ( my $p = $self->{service_config}{'bahn.de'}{proxy} ) {

	elsif ( my $p = $self->{dbris_config}{'bahn.de'}{proxy} ) {

		$proxy = $p;

	}