author | Michael Krelin <hacker@klever.net> | 2006-11-07 22:35:43 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-11-07 22:35:43 (UTC) |
commit | d2bac550faab6e8ffbf3f3d43fdf7cd862cf0a72 (patch) (unidiff) | |
tree | f2f41e6b5f6d029f9cb77c58b317fd42cc900246 /src | |
parent | 048b283417574ab29fa28a44e1cedb2c76a2e327 (diff) | |
download | sitecing-d2bac550faab6e8ffbf3f3d43fdf7cd862cf0a72.zip sitecing-d2bac550faab6e8ffbf3f3d43fdf7cd862cf0a72.tar.gz sitecing-d2bac550faab6e8ffbf3f3d43fdf7cd862cf0a72.tar.bz2 |
requests per child limitation handling bug
-rw-r--r-- | src/sitecing-fastcgi.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc index d8f18a6..57aba60 100644 --- a/src/sitecing-fastcgi.cc +++ b/src/sitecing-fastcgi.cc | |||
@@ -89,129 +89,129 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file) | |||
89 | throw konforka::exception(CODEPOINT,"unspecified root for sources"); | 89 | throw konforka::exception(CODEPOINT,"unspecified root for sources"); |
90 | if(!(config.flags&configuration::flag_root_intermediate)) | 90 | if(!(config.flags&configuration::flag_root_intermediate)) |
91 | throw konforka::exception(CODEPOINT,"unspecified root for intermediate files"); | 91 | throw konforka::exception(CODEPOINT,"unspecified root for intermediate files"); |
92 | if(!(config.flags&configuration::flag_root_so)) | 92 | if(!(config.flags&configuration::flag_root_so)) |
93 | throw konforka::exception(CODEPOINT,"unspecified root for shared objects"); | 93 | throw konforka::exception(CODEPOINT,"unspecified root for shared objects"); |
94 | if(config.flags&configuration::flag_min_children) | 94 | if(config.flags&configuration::flag_min_children) |
95 | min_children = config.min_children; | 95 | min_children = config.min_children; |
96 | if(config.flags&configuration::flag_max_children) | 96 | if(config.flags&configuration::flag_max_children) |
97 | max_children = config.max_children; | 97 | max_children = config.max_children; |
98 | if(config.flags&configuration::flag_min_spare_children) | 98 | if(config.flags&configuration::flag_min_spare_children) |
99 | min_spare_children = config.min_spare_children; | 99 | min_spare_children = config.min_spare_children; |
100 | if(config.flags&configuration::flag_max_spare_children) | 100 | if(config.flags&configuration::flag_max_spare_children) |
101 | max_spare_children = config.max_spare_children; | 101 | max_spare_children = config.max_spare_children; |
102 | if(max_children<min_spare_children) | 102 | if(max_children<min_spare_children) |
103 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren"); | 103 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren"); |
104 | if(min_children>max_spare_children && max_spare_children>=0) | 104 | if(min_children>max_spare_children && max_spare_children>=0) |
105 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren"); | 105 | throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren"); |
106 | if(config.flags&configuration::flag_multi_process) { | 106 | if(config.flags&configuration::flag_multi_process) { |
107 | multi = config.multi_process; | 107 | multi = config.multi_process; |
108 | }else{ | 108 | }else{ |
109 | if(config.flags&configuration::flag_listen_socket) | 109 | if(config.flags&configuration::flag_listen_socket) |
110 | multi = true; | 110 | multi = true; |
111 | else | 111 | else |
112 | multi = false; | 112 | multi = false; |
113 | } | 113 | } |
114 | fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0); | 114 | fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0); |
115 | if(!fss) | 115 | if(!fss) |
116 | throw konforka::exception(CODEPOINT,"failed to establish listening socket"); | 116 | throw konforka::exception(CODEPOINT,"failed to establish listening socket"); |
117 | if(config.flags&configuration::flag_daemonize && config.daemonize) { | 117 | if(config.flags&configuration::flag_daemonize && config.daemonize) { |
118 | pid_t pf = fork(); | 118 | pid_t pf = fork(); |
119 | if(pf<0) | 119 | if(pf<0) |
120 | throw konforka::exception(CODEPOINT,"failed to fork()"); | 120 | throw konforka::exception(CODEPOINT,"failed to fork()"); |
121 | if(pf) { | 121 | if(pf) { |
122 | die_humbly=true; | 122 | die_humbly=true; |
123 | _exit(0); | 123 | _exit(0); |
124 | } | 124 | } |
125 | } | 125 | } |
126 | if(config.flags&configuration::flag_pid_file) { | 126 | if(config.flags&configuration::flag_pid_file) { |
127 | pidfile.set(config.pid_file); | 127 | pidfile.set(config.pid_file); |
128 | } | 128 | } |
129 | if(multi) | 129 | if(multi) |
130 | sem.init(); | 130 | sem.init(); |
131 | } | 131 | } |
132 | sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { | 132 | sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { |
133 | if(fss) | 133 | if(fss) |
134 | delete fss; | 134 | delete fss; |
135 | } | 135 | } |
136 | 136 | ||
137 | void sitecing_fastcgi_pm::process(int slot) { | 137 | void sitecing_fastcgi_pm::process(int slot) { |
138 | signal(SIGINT,SIG_DFL); | 138 | signal(SIGINT,SIG_DFL); |
139 | signal(SIGABRT,SIG_DFL); | 139 | signal(SIGABRT,SIG_DFL); |
140 | signal(SIGTERM,SIG_DFL); | 140 | signal(SIGTERM,SIG_DFL); |
141 | give_up_privs(); | 141 | give_up_privs(); |
142 | scoreboard_slot *sslot = sboard.get_slot(slot); | 142 | scoreboard_slot *sslot = sboard.get_slot(slot); |
143 | try { | 143 | try { |
144 | sitespace ss(config); | 144 | sitespace ss(config); |
145 | fcgi_socket& fs = *fss; | 145 | fcgi_socket& fs = *fss; |
146 | sitecing_interface_cgi scif(&ss); | 146 | sitecing_interface_cgi scif(&ss); |
147 | string component_path; | 147 | string component_path; |
148 | string action; | 148 | string action; |
149 | config_options::action_handler_t *action_handler; | 149 | config_options::action_handler_t *action_handler; |
150 | int rpc = 0; | 150 | int rpc = 0; |
151 | if(config.flags&configuration::flag_requests_per_child) | 151 | if(config.flags&configuration::flag_requests_per_child) |
152 | rpc = config.requests_per_child; | 152 | rpc = config.requests_per_child; |
153 | for(int req=0;(rpc<=0) || (req<rpc);rpc++) { | 153 | for(int req=0;(rpc<=0) || (req<rpc);++req) { |
154 | semaphore_lock sl; | 154 | semaphore_lock sl; |
155 | if(multi) { | 155 | if(multi) { |
156 | sslot->state = scoreboard_slot::state_idle; | 156 | sslot->state = scoreboard_slot::state_idle; |
157 | sl.sem = &sem; | 157 | sl.sem = &sem; |
158 | sl.lock(); | 158 | sl.lock(); |
159 | } | 159 | } |
160 | sslot->state = scoreboard_slot::state_accept; | 160 | sslot->state = scoreboard_slot::state_accept; |
161 | fcgi_interface fi(fs); | 161 | fcgi_interface fi(fs); |
162 | sslot->state = scoreboard_slot::state_processing; | 162 | sslot->state = scoreboard_slot::state_processing; |
163 | if(multi) | 163 | if(multi) |
164 | sl.unlock(); | 164 | sl.unlock(); |
165 | cgi_gateway gw(fi); | 165 | cgi_gateway gw(fi); |
166 | scif.prepare(&gw); | 166 | scif.prepare(&gw); |
167 | try { | 167 | try { |
168 | component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); | 168 | component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); |
169 | string full_component_path; | 169 | string full_component_path; |
170 | string sitecing_path_info; | 170 | string sitecing_path_info; |
171 | while(true) { | 171 | while(true) { |
172 | full_component_path = config.root_source+'/'+component_path; | 172 | full_component_path = config.root_source+'/'+component_path; |
173 | if(!access(full_component_path.c_str(),F_OK)) | 173 | if(!access(full_component_path.c_str(),F_OK)) |
174 | break; | 174 | break; |
175 | string::size_type sl = component_path.rfind('/'); | 175 | string::size_type sl = component_path.rfind('/'); |
176 | if(sl==string::npos) | 176 | if(sl==string::npos) |
177 | throw konforka::exception(CODEPOINT,"can't find the target component"); | 177 | throw konforka::exception(CODEPOINT,"can't find the target component"); |
178 | sitecing_path_info.insert(0,component_path,sl,string::npos); | 178 | sitecing_path_info.insert(0,component_path,sl,string::npos); |
179 | component_path.erase(sl); | 179 | component_path.erase(sl); |
180 | } | 180 | } |
181 | fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; | 181 | fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; |
182 | fi.metavars["SITECING_COMPONENT_PATH"]=component_path; | 182 | fi.metavars["SITECING_COMPONENT_PATH"]=component_path; |
183 | action = component_path; | 183 | action = component_path; |
184 | action_handler = config.lookup_action_handler(component_path); | 184 | action_handler = config.lookup_action_handler(component_path); |
185 | if(action_handler) { | 185 | if(action_handler) { |
186 | action = action_handler->action; | 186 | action = action_handler->action; |
187 | } | 187 | } |
188 | string pwd = konforka::dir_name(full_component_path); | 188 | string pwd = konforka::dir_name(full_component_path); |
189 | if(chdir(pwd.c_str())) | 189 | if(chdir(pwd.c_str())) |
190 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 190 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
191 | so_component soc = ss.fetch(action,&scif); | 191 | so_component soc = ss.fetch(action,&scif); |
192 | if(action_handler) { | 192 | if(action_handler) { |
193 | soc.ac->run(__magic_action, | 193 | soc.ac->run(__magic_action, |
194 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 194 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
195 | &(action_handler->args) | 195 | &(action_handler->args) |
196 | ); | 196 | ); |
197 | }else{ | 197 | }else{ |
198 | soc.ac->main(0,NULL); | 198 | soc.ac->main(0,NULL); |
199 | } | 199 | } |
200 | }catch(http_status& hs) { | 200 | }catch(http_status& hs) { |
201 | scif.headers["Status"] = hs.status+" "+hs.message; | 201 | scif.headers["Status"] = hs.status+" "+hs.message; |
202 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 202 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
203 | if(!hshp.empty()) { | 203 | if(!hshp.empty()) { |
204 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 204 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |
205 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), | 205 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), |
206 | config.root_so.c_str(),action.c_str(),&hs); | 206 | config.root_so.c_str(),action.c_str(),&hs); |
207 | } | 207 | } |
208 | }catch(compile_error& ce) { | 208 | }catch(compile_error& ce) { |
209 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 209 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
210 | if(co_exception_handler) { | 210 | if(co_exception_handler) { |
211 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 211 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
212 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); | 212 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); |
213 | }else{ | 213 | }else{ |
214 | ce.see(CODEPOINT); | 214 | ce.see(CODEPOINT); |
215 | throw; | 215 | throw; |
216 | } | 216 | } |
217 | }catch(preprocessor_error& pe) { | 217 | }catch(preprocessor_error& pe) { |