ebb62867fb
Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
...
advantage of per-module loglevels
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
ad308e2343
Make the error message correspond to the code, which sets APR_SO_NONBLOCK.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907105 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 21:37:56 +00:00
3e338e488c
Elaborate on low hanging XXX fruit
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885689 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 08:44:11 +00:00
e054fa7183
change the callable functions in the mod_watchdog API
...
to optional hooks to avoid module ordering or other symbol
resolution issues; affected:
ap_watchdog_get_instance
ap_watchdog_register_callback
ap_watchdog_set_callback_interval
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820427 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 20:00:37 +00:00
406bf000e2
Add port in the logic.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820213 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 08:50:57 +00:00
9518cc6237
Add slotmem storage logic for multicast logic.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@819949 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 13:50:42 +00:00
dcd3a1ebfb
Oops my bad: Stop copying and pasting code.
...
Remove argstr_to_table and use qs_to_table.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@800685 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 06:49:48 +00:00
ede6e93b11
Fix warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@800319 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 11:48:40 +00:00
0d6b9d370d
Add the file logic for the handler.
...
(Next step add the slotmem logic for the multicast socket).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@799334 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:37:22 +00:00
7dc5818d99
mark some private module data as "static", resolving
...
a duplicate definition error from the linker
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798923 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 14:38:02 +00:00
249ada6b69
Align logic and message :)
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798695 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 20:13:18 +00:00
d072258f05
Put the hm_slot_server_t in a common include.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798507 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 12:28:18 +00:00
65f63d24a8
* Silence compiler warnings about unused variables.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@792407 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 06:07:36 +00:00
1bcd22de93
finally fixed NetWare export list (thanks help from rjung).
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@792154 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 14:17:39 +00:00
a427710d5e
fixed types, fixed NetWare build.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791682 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 02:54:27 +00:00
3e27e5905e
fixed import list.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791681 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 02:47:51 +00:00
84c7d1c676
Add use slotmem. Directive HeartbeatMaxServers > 10 to activate the logic.
...
Otherwise it uses the file logic to store the heartbeats.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791617 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 21:14:21 +00:00
5919659e18
fixed NetWare build includes.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791525 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 15:45:54 +00:00
35243888d2
cleanup truncation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775257 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 17:46:29 +00:00
6ee05d9afb
Fix win32 build includes
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775253 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 17:38:28 +00:00
1a456432d4
Reorder so and watchdog to configure before cluster modules
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771998 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 22:37:02 +00:00
0fe6d791a5
complete r771579, refactoring mod_watchdog as loadable on win32
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771581 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:26:24 +00:00
2d04bc77eb
* Add missing include to fix compiler warnings
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@765735 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 20:00:14 +00:00
2c15909ac0
write Ok to tomcat.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@764804 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 14:48:34 +00:00
eb25ea2276
Add a logic to use an handler and HTTP.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@764762 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 13:01:54 +00:00
b2b55733ee
Remove the C++ style comment and use 1 for keep_running.
...
(Thanks Rüdiger).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@763151 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 09:12:32 +00:00
ebd6c22532
Arrange traces.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@762771 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 13:38:01 +00:00
27ce291f0c
Set keep_running and clean pool if not.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@762730 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 12:10:57 +00:00
0acd50d150
clean up apr_time_from_msec() compatibility macros
...
* where needed, base on APR_VERSION_AT_LEAST() so we remember what this is about
* where not, axe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@761084 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 22:06:49 +00:00
7a9a1d197a
* Removed unused variables.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759954 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 13:14:29 +00:00
772241ef68
Use named watchdog for heartmonitor.
...
The watchdog has zero interval, leaving to the callback to determine the running loop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759862 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 08:07:59 +00:00
e897431506
Use correct check logic
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759849 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 06:38:14 +00:00
09ca3bc6bf
If there are multiple hook watchdog threads registered, make sure we fire on default one only
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759847 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 06:35:47 +00:00
2103ba72a1
Use child singleton watchdog for running the heartbeat module
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759751 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 19:17:30 +00:00
78aa2421a7
* modules/cluster/mod_heartmonitor.c
...
(hm_update_stats): Flush heartbeat file before closing, to make sure the file
is always written correctly, and check for errors on flush or close.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759131 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 13:27:44 +00:00
9cdd58c159
no ap_my_generation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758396 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 18:39:19 +00:00
8b8495768a
Declare variables prior to code statements otherwise some compilers choke.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757840 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 15:19:54 +00:00
932b13a818
Tag the pool at creation time.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@736822 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 22:08:46 +00:00
e05e9c2d1a
Use the more traditional create/clear/destroy style for the main loop pool.
...
Suggested by: jerenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@736809 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 21:47:16 +00:00
0a0ac63f29
Use cmd->temp_pool for temp allocations during configuration.
...
Suggested by: Takashi Sato <takashi lans-tv.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724092 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:23:04 +00:00
5aa5f9850d
Make ctx:status an apr_status_t, and be consistent about checking and setting it.
...
Suggested by: Takashi Sato <takashi lans-tv.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724091 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:15:40 +00:00
d9ceaf6a9b
Use APR_THREAD_FUNC for heart{beat,monitor} thread workers.
...
Suggested by: Takashi Sato <takashi lans-tv.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724090 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:11:42 +00:00
b2d3c5d5a5
Also init mutex_path in hm_create_config.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723679 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:20:19 +00:00
c283a61afb
Print the correct enum value for the lock mech.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723677 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:16:20 +00:00
d9370018b8
Add a comment explaining the start mutex.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723675 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:14:14 +00:00
e5c05b8707
Log the correct function name.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723674 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:12:52 +00:00
609f1d7aeb
D'oh. Fix r723672 and use the correct define.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723673 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:12:09 +00:00
7b55419d4e
Make the frequency with how often we write the stats file a compile time option.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723672 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:08:53 +00:00
88c3dd9d66
Make hm_ctx_t:keep_running a volatile.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723669 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:06:06 +00:00
b23b3ec7f8
Show the correct mutex type (even if its just the enum id) rather than the default one, if it fails.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723666 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:03:57 +00:00
