Mukund Sivaraman
9c0c3d5ced
[BB#17] Add custom HTTP request headers to outgoing HTTP requests
2010-01-08 22:05:17 +05:30
Mukund Sivaraman
b96a3a3250
Fix case in log message
2010-01-06 11:54:57 +05:30
Michael Adam
e0fabc6127
log: confess - add my (C) after substantial changes.
...
Michael
2009-12-23 00:33:31 +01:00
Michael Adam
5e8c8508ef
conf: confess - add my (C) after substantial changes.
...
Michael
2009-12-23 00:33:21 +01:00
Michael Adam
4a11f9f08f
log: remove unneeded truncate_log_file().
...
Michael
2009-12-23 00:31:56 +01:00
Michael Adam
c07cd2e44e
Use shutdown_logging() in main().
...
Michael
2009-12-23 00:31:56 +01:00
Michael Adam
71a035d619
Use reload_config() in main() to load config and init logging.
...
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
bc10479452
log: fix log_message so do only one write before the fsync.
...
This way the logging from the various child processes does not
get clobbered up. Formerly, the different write portions
(time stamp, message, newline) would get mixed from the
various child processes' log messages.
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
adf4640104
log: add start/end debug messages for "sending stored logs".
...
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
0466526b1d
Add warning comments to SIGHUP handlers, that we ignore the retrun code of reload_config().
...
This can actually fail, and we probably need some way to handle this.
Like an emergency error exit or so...
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
8346a20aa0
Don't truncate the log file in the SIGHUP handler.
...
Logging is re-initialized by reload_config() now.
And truncation is wrong anyways: A syslog mechanism will
move the current log file and the reopen-action will just
create a new empty log file upon SIGHUP.
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
fb2e65f40b
enhance reload_config to correctly re-initialize the logging subsystem.
...
This includes reopening the log file (in append mode).
Also switching from syslog to logfile and visa versa are included
when called from the SIGHUP handler.
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
c4b9454807
log: enhance close_log_file to reset logfile_fd to -1 after closing
...
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
f3c8424515
log.c: remove superfluous uses of #ifdef HAVE_SYSLOG_H
...
When this code is hit, availability of syslog has already
been checked (when reading the config file). So config.syslog == TRUE
only when HAVE_SYSLOG_H is defined.
So I remove the preprocessor checks which only clobber the logic
and make the code harder to read (IMHO).
Michael
2009-12-23 00:31:55 +01:00
Michael Adam
2c14f89bfc
main: remove global bool processed_config_file.
...
This seemed out of place. Now the information is
stored in the correct places (as log.c:logging_initialized).
This way, we will be able to cleanly re-initialize
logging during config reload (SIGHUP) in subsequent
commits.
Michael
2009-12-23 00:27:32 +01:00
Michael Adam
210e82d08d
log: call send_stored_logs in setup_logging instead of in main().
...
This is where it actually belongs.
Michael
2009-12-23 00:27:32 +01:00
Michael Adam
891846f23e
log: add boolean local variable logging_initialized.
...
This controls whether log_messages should write to the
log file / syslog or rather to the log_message_storage.
This will make the global processed_config_file variable
from main unneccessary in the next step.
Michael
2009-12-23 00:27:26 +01:00
Michael Adam
649b2c0683
log: add function shutdown_logging().
...
Michael
2009-12-23 00:27:26 +01:00
Michael Adam
479562ad2b
reload config upon SIGHUP
...
Michael
2009-12-22 00:15:00 +01:00
Michael Adam
91492773b1
conf: add a log messate ("reloading config file")
...
Michael
2009-12-22 00:15:00 +01:00
Michael Adam
e9baa2977c
conf: adapt a log message (add quotes to string value)
...
Michael
2009-12-22 00:15:00 +01:00
Michael Adam
f7419c60be
conf: elaborate a comment
...
Michael
2009-12-22 00:15:00 +01:00
Michael Adam
93dfb1ac5b
conf: change a log message (to be more reasonable?)
...
Michael
2009-12-22 00:15:00 +01:00
Michael Adam
8bf91ce80f
main: add convenience wrapper reload_config() for reload_config_file()
...
Michael
2009-12-22 00:14:59 +01:00
Michael Adam
72632f6569
conf.h: add "extern" to prototype of reload_config_file
...
Michael
2009-12-22 00:14:59 +01:00
Michael Adam
6ea160ffff
conf: make free_config static
...
Michael
2009-12-22 00:14:59 +01:00
Michael Adam
c15434df2b
conf: make load_config_file static.
...
Michael
2009-12-22 00:14:59 +01:00
Michael Adam
d3d31b434a
conf: rename reload_config --> reload_config_file
...
Michael
2009-12-22 00:14:59 +01:00
Michael Adam
d522221668
Fix restarting of tinyproxy: call setsockopt with REUSEADDR _before_ calling bind
...
Somehow this got moved too far down in the ipv6 changes.
Thanks to Mathew Mrosko for helping me debugging this.
Michael
2009-12-08 01:24:31 +01:00
Michael Adam
5bba62bcde
Fix the build with --enable-transaparent after conf changes.
...
Michael
2009-12-07 23:42:55 +01:00
Michael Adam
0ba5cbea4f
fix build with "--enable-reverse" after conf changes
...
Michael
2009-12-07 23:40:24 +01:00
Michael Adam
7290691142
Move definition of "struct config_s" from main.h to conf.h
...
Michael
2009-12-07 22:33:27 +01:00
Michael Adam
34e4be193e
main.h: fix tabs ---> spaces
...
Michael
2009-12-07 22:33:27 +01:00
Michael Adam
4b54fc203f
conf: remove direct use of config from reload_config()
...
The "conf" argument has to be used.
Michael
2009-12-07 22:33:27 +01:00
Michael Adam
ad2f478c46
conf: remove direct reference to config from load_config_file()
...
This has to use the parameter "conf".
Michael
2009-12-07 22:33:26 +01:00
Michael Adam
947d85cefc
Use reload_config() in main.
...
Michael
2009-12-07 01:11:35 +01:00
Michael Adam
0d0de2fcc5
Add reload_config() - (re-)load the config file, keeping defaults.
...
This allows for later reloading the config at SIGHUP (e.g.).
First the old config data is freed, then the defaults that
are given as a parameter are copied over in a rather clumsy
manual fashion (maybe something more clever can be done here)
and finally, the actual config file is loaded.
Michael
2009-12-07 01:11:35 +01:00
Michael Adam
2ccebf7a95
main: Move setup_logging to after the config post-processing checks.
...
Michael
2009-12-07 00:40:25 +01:00
Michael Adam
dcbf99d334
Add free_config() - free all config data.
...
Michael
2009-12-07 00:32:22 +01:00
Michael Adam
1360f530f1
Don't make config_file const in the config struct.
...
Michael
2009-12-07 00:32:22 +01:00
Michael Adam
d0a91c2f9b
Add the anonymous_map hasmap to the config struct.
...
Michael
2009-12-07 00:22:53 +01:00
Michael Adam
fa073543c4
Add free_connect_ports_list().
...
Michael
2009-12-07 00:22:52 +01:00
Michael Adam
4c0a4d985f
Add connect_ports list to config struct instead of keeping extra global var.
...
Michael
2009-12-07 00:22:52 +01:00
Michael Adam
c981b246ce
Move handling of connect_ports list to its own source module.
...
Michael
2009-12-07 00:22:52 +01:00
Michael Adam
8cb182e1b8
Add access_list to the config struct instead of a global variable in acl.c.
...
Change insert_acl, check_acl and flush_access_list to take a corresponding
argument.
Michael
2009-12-07 00:22:46 +01:00
Michael Adam
6266197e92
acl: add function flush_access_list().
2009-12-07 00:22:46 +01:00
Michael Adam
2e6999df4a
Add free_reversepath_list().
...
Michael
2009-12-07 00:22:46 +01:00
Michael Adam
3f1201c8b3
Add a reversepath argument to reversepath_get().
...
This abstracts the setter/getter functions for the reversepath
list from the concrete list in config.reversepath_list.
Michael
2009-12-07 00:22:46 +01:00
Michael Adam
624d146cd6
Add reversepath_list parameter to reversepath_add.
...
Michael
2009-12-07 00:22:36 +01:00
Michael Adam
21aa3ecf60
upstream: add free_upstream_list ()
...
Michael
2009-12-07 00:22:36 +01:00