clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-08-19 12:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactored placeholder management

Browse Source
This commit is contained in:
roberto@debian32
2011-09-30 10:21:26 +02:00
parent 8e851aa6a1
commit eada0c09e0
4 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils.c
+56
View File
@@ -3087,5 +3087,61 @@ void uwsgi_build_cap(char *what) {
}
free(caps);
}
void uwsgi_apply_config_pass(char symbol, char*(*hook)(char *) ) {
int i, j;
for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
int has_symbol = 0;
char *magic_key = NULL;
char *magic_val = NULL;
if (uwsgi.exported_opts[i]->value && !uwsgi.exported_opts[i]->configured) {
for (j = 0; j < (int) strlen(uwsgi.exported_opts[i]->value); j++) {
if (uwsgi.exported_opts[i]->value[j] == symbol) {
has_symbol = 1;
}
else if (uwsgi.exported_opts[i]->value[j] == '(' && has_symbol == 1) {
has_symbol = 2;
magic_key = uwsgi.exported_opts[i]->value + j + 1;
}
else if (has_symbol > 1) {
if (uwsgi.exported_opts[i]->value[j] == ')') {
if (has_symbol <= 2) {
magic_key = NULL;
has_symbol = 0;
continue;
}
#ifdef UWSGI_DEBUG
uwsgi_log("need to interpret the %.*s tag\n", has_symbol - 2, magic_key);
#endif
char *tmp_magic_key = uwsgi_concat2n(magic_key, has_symbol - 2, "", 0);
magic_val = hook(tmp_magic_key);
free(tmp_magic_key);
if (!magic_val) {
magic_key = NULL;
has_symbol = 0;
continue;
}
uwsgi.exported_opts[i]->value = uwsgi_concat4n(uwsgi.exported_opts[i]->value, (magic_key - 2) - uwsgi.exported_opts[i]->value, magic_val, strlen(magic_val), magic_key + (has_symbol - 1), strlen(magic_key + (has_symbol - 1)), "", 0);
#ifdef UWSGI_DEBUG
uwsgi_log("computed new value = %s\n", uwsgi.exported_opts[i]->value);
#endif
magic_key = NULL;
has_symbol = 0;
j = 0;
}
else {
has_symbol++;
}
}
else {
has_symbol = 0;
}
}
}
}
}
#endif
uwsgi.c
+6 -50
View File
@@ -828,7 +828,7 @@ int uwsgi_init(int argc, char *argv[], char *envp[]) {
int main(int argc, char *argv[], char *envp[]) {
#endif
int i, j;
int i;
int rlen;
FILE *pidfile;
@@ -1212,55 +1212,11 @@ int main(int argc, char *argv[], char *envp[]) {
}
// second pass
for (i = 0; i < uwsgi.exported_opts_cnt; i++) {
int has_percent = 0;
char *magic_key = NULL;
char *magic_val = NULL;
if (uwsgi.exported_opts[i]->value && !uwsgi.exported_opts[i]->configured) {
for (j = 0; j < (int) strlen(uwsgi.exported_opts[i]->value); j++) {
if (uwsgi.exported_opts[i]->value[j] == '%') {
has_percent = 1;
}
else if (uwsgi.exported_opts[i]->value[j] == '(' && has_percent == 1) {
has_percent = 2;
magic_key = uwsgi.exported_opts[i]->value + j + 1;
}
else if (has_percent > 1) {
if (uwsgi.exported_opts[i]->value[j] == ')') {
if (has_percent <= 2) {
magic_key = NULL;
has_percent = 0;
continue;
}
#ifdef UWSGI_DEBUG
uwsgi_log("need to interpret the %.*s tag\n", has_percent - 2, magic_key);
#endif
char *tmp_magic_key = uwsgi_concat2n(magic_key, has_percent - 2, "", 0);
magic_val = uwsgi_get_exported_opt(tmp_magic_key);
free(tmp_magic_key);
if (!magic_val) {
magic_key = NULL;
has_percent = 0;
continue;
}
uwsgi.exported_opts[i]->value = uwsgi_concat4n(uwsgi.exported_opts[i]->value, (magic_key - 2) - uwsgi.exported_opts[i]->value, magic_val, strlen(magic_val), magic_key + (has_percent - 1), strlen(magic_key + (has_percent - 1)), "", 0);
#ifdef UWSGI_DEBUG
uwsgi_log("computed new value = %s\n", uwsgi.exported_opts[i]->value);
#endif
magic_key = NULL;
has_percent = 0;
j = 0;
}
else {
has_percent++;
}
}
else {
has_percent = 0;
}
}
}
}
uwsgi_apply_config_pass('%', uwsgi_get_exported_opt);
// third pass: ENVs
uwsgi_apply_config_pass('$', (char *(*)(char *))getenv);
// ok, the options dictionary is available, lets manage it
uwsgi.h
+2
View File
@@ -2233,6 +2233,8 @@ struct uwsgi_dyn_dict *uwsgi_dyn_dict_new(struct uwsgi_dyn_dict **, char *, int,
void uwsgi_send_stats(int);
void uwsgi_apply_config_pass(char symbol, char*(*)(char *) );
#ifdef UWSGI_CAP
void uwsgi_build_cap(char *);
#endif
welcome.ini
+6 -4
View File
@@ -1,9 +1,11 @@
[uwsgi]
socket = :3031
socket = :$(PORT)
socket = /tmp/uwsgi_welcome.socket
vacuum = true
module = welcome
master = true
processes = 4
appname = welcome
module = %(appname)
numproc = 4
master = %(vacuum)
processes = %(numproc)
mount = /werkzeug=tests/werkzeug.py
manage-script-name = true