comparison fetch_weather.pl @ 461:721a56cd62e3

fetch_weather: Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 18 Dec 2017 14:41:51 +0200
parents ec97c29768e7
children 9b4b1e4ce313
comparison
equal deleted inserted replaced
460:dbe249968591 461:721a56cd62e3
60 60
61 61
62 sub fetch_http($) 62 sub fetch_http($)
63 { 63 {
64 my $agent = LWP::UserAgent->new; 64 my $agent = LWP::UserAgent->new;
65 $agent->agent($settings{"http_user_agent"}); 65 $agent->agent(opt_get("http_user_agent"));
66 $agent->timeout(20); 66 $agent->timeout(20);
67 67
68 my $req = HTTP::Request->new(GET => $_[0]); 68 my $req = HTTP::Request->new(GET => $_[0]);
69 $req->header('Accept-Encoding' => scalar HTTP::Message::decodable()); 69 $req->header('Accept-Encoding' => scalar HTTP::Message::decodable());
70 70
249 } 249 }
250 elsif (/^\s*\"?([a-zA-Z0-9_]+)\"?\s*=>?\s*(\d+),?\s*$/) 250 elsif (/^\s*\"?([a-zA-Z0-9_]+)\"?\s*=>?\s*(\d+),?\s*$/)
251 { 251 {
252 my $key = lc($1); 252 my $key = lc($1);
253 my $value = $2; 253 my $value = $2;
254 if (defined($settings{$key})) { 254 if (defined($settings{$key}))
255 {
255 $settings{$key} = $value; 256 $settings{$key} = $value;
256 } 257 }
257 else 258 else
258 { 259 {
259 mlog("[$filename:$line] Unknown setting '$key' = $value\n"); 260 mlog("[$filename:$line] Unknown setting '$key' = $value\n");
320 "\n" 321 "\n"
321 ); 322 );
322 } 323 }
323 324
324 opt_read_config($opt_cfgfile) == 0 or die("Errors while parsing configuration file '".$opt_cfgfile."'.\n"); 325 opt_read_config($opt_cfgfile) == 0 or die("Errors while parsing configuration file '".$opt_cfgfile."'.\n");
325 print STDERR "Forcing update of all data.\n" if $settings{"force_update"}; 326 print STDERR "Forcing update of all data.\n" if opt_chk_bool("force_update");
326 327
327 328
328 ### 329 ###
329 ### Load already cached data 330 ### Load already cached data
330 ### 331 ###