git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug: indent lookup operations
[exim.git]
/
src
/
src
/
lookups
/
redis.c
diff --git
a/src/src/lookups/redis.c
b/src/src/lookups/redis.c
index c36b1bda72f51603644d5e9996612c1419b08b24..6de675787141cc73ad45f48274fe39b40774461b 100644
(file)
--- a/
src/src/lookups/redis.c
+++ b/
src/src/lookups/redis.c
@@
-47,7
+47,7
@@
redis_connection *cn;
while ((cn = redis_connections))
{
redis_connections = cn->next;
while ((cn = redis_connections))
{
redis_connections = cn->next;
- DEBUG(D_lookup) debug_printf("close REDIS connection: %s\n", cn->server);
+ DEBUG(D_lookup) debug_printf
_indent
("close REDIS connection: %s\n", cn->server);
redisFree(cn->handle);
}
}
redisFree(cn->handle);
}
}
@@
-92,7
+92,7
@@
We can write to the string, since it is in a nextinlist temporary buffer.
This copy is also used for debugging output. */
memset(sdata, 0, sizeof(sdata)) /* Set all to NULL */;
This copy is also used for debugging output. */
memset(sdata, 0, sizeof(sdata)) /* Set all to NULL */;
-for (i = 2; i > 0; i--)
+for (i
nt i
= 2; i > 0; i--)
{
uschar *pp = Ustrrchr(server, '/');
{
uschar *pp = Ustrrchr(server, '/');
@@
-154,7
+154,7
@@
if (!cn)
}
DEBUG(D_lookup)
}
DEBUG(D_lookup)
- debug_printf("REDIS new connection: host=%s port=%d socket=%s database=%s\n",
+ debug_printf
_indent
("REDIS new connection: host=%s port=%d socket=%s database=%s\n",
sdata[0], port, socket, sdata[1]);
/* Get store for a new handle, initialize it, and connect to the server */
sdata[0], port, socket, sdata[1]);
/* Get store for a new handle, initialize it, and connect to the server */
@@
-178,7
+178,7
@@
if (!cn)
else
{
DEBUG(D_lookup)
else
{
DEBUG(D_lookup)
- debug_printf("REDIS using cached connection for %s\n", server_copy);
+ debug_printf
_indent
("REDIS using cached connection for %s\n", server_copy);
}
/* Authenticate if there is a password */
}
/* Authenticate if there is a password */
@@
-199,15
+199,14
@@
if(sdata[1])
*defer_break = FALSE;
goto REDIS_EXIT;
}
*defer_break = FALSE;
goto REDIS_EXIT;
}
- DEBUG(D_lookup) debug_printf("REDIS: Selecting database=%s\n", sdata[1]);
+ DEBUG(D_lookup) debug_printf
_indent
("REDIS: Selecting database=%s\n", sdata[1]);
}
/* split string on whitespace into argv */
{
uschar * argv[32];
}
/* split string on whitespace into argv */
{
uschar * argv[32];
- int i;
const uschar * s = command;
const uschar * s = command;
- int siz, ptr;
+ int siz, ptr
, i
;
uschar c;
while (isspace(*s)) s++;
uschar c;
while (isspace(*s)) s++;
@@
-221,7
+220,7
@@
if(sdata[1])
g = string_catn(g, s, 1);
argv[i] = string_from_gstring(g);
g = string_catn(g, s, 1);
argv[i] = string_from_gstring(g);
- DEBUG(D_lookup) debug_printf("REDIS: argv[%d] '%s'\n", i, argv[i]);
+ DEBUG(D_lookup) debug_printf
_indent
("REDIS: argv[%d] '%s'\n", i, argv[i]);
while (isspace(*s)) s++;
}
while (isspace(*s)) s++;
}
@@
-243,17
+242,17
@@
switch (redis_reply->type)
*errmsg = string_sprintf("REDIS: lookup result failed: %s\n", redis_reply->str);
/* trap MOVED cluster responses and follow them */
*errmsg = string_sprintf("REDIS: lookup result failed: %s\n", redis_reply->str);
/* trap MOVED cluster responses and follow them */
- if (Ustrncmp(redis_reply->str, "MOVED", 5))
+ if (Ustrncmp(redis_reply->str, "MOVED", 5)
== 0
)
{
DEBUG(D_lookup)
{
DEBUG(D_lookup)
- debug_printf("REDIS: cluster redirect %s\n", redis_reply->str);
+ debug_printf
_indent
("REDIS: cluster redirect %s\n", redis_reply->str);
/* follow redirect
/* follow redirect
- This is cheating, we simply set defer_break =
TRU
E to move on to
+ This is cheating, we simply set defer_break =
FALS
E to move on to
the next server in the redis_servers list */
the next server in the redis_servers list */
- *defer_break =
TRU
E;
+ *defer_break =
FALS
E;
return DEFER;
} else {
return DEFER;
} else {
- *defer_break =
FALS
E;
+ *defer_break =
TRU
E;
}
*do_cache = 0;
goto REDIS_EXIT;
}
*do_cache = 0;
goto REDIS_EXIT;
@@
-261,7
+260,7
@@
switch (redis_reply->type)
case REDIS_REPLY_NIL:
DEBUG(D_lookup)
case REDIS_REPLY_NIL:
DEBUG(D_lookup)
- debug_printf("REDIS: query was not one that returned any data\n");
+ debug_printf
_indent
("REDIS: query was not one that returned any data\n");
result = string_catn(result, US"", 1);
*do_cache = 0;
goto REDIS_EXIT;
result = string_catn(result, US"", 1);
*do_cache = 0;
goto REDIS_EXIT;
@@
-281,7
+280,7
@@
switch (redis_reply->type)
/* NOTE: For now support 1 nested array result. If needed a limitless
result can be parsed */
/* NOTE: For now support 1 nested array result. If needed a limitless
result can be parsed */
- for (i = 0; i < redis_reply->elements; i++)
+ for (i
nt i
= 0; i < redis_reply->elements; i++)
{
entry = redis_reply->element[i];
{
entry = redis_reply->element[i];
@@
-291,13
+290,13
@@
switch (redis_reply->type)
switch (entry->type)
{
case REDIS_REPLY_INTEGER:
switch (entry->type)
{
case REDIS_REPLY_INTEGER:
- result = string_
cat(result, string_sprintf("%d", entry->integer)
);
+ result = string_
fmt_append(result, "%d", entry->integer
);
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US entry->str, entry->len);
break;
case REDIS_REPLY_ARRAY:
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US entry->str, entry->len);
break;
case REDIS_REPLY_ARRAY:
- for (j = 0; j < entry->elements; j++)
+ for (
int
j = 0; j < entry->elements; j++)
{
tentry = entry->element[j];
{
tentry = entry->element[j];
@@
-307,25
+306,25
@@
switch (redis_reply->type)
switch (tentry->type)
{
case REDIS_REPLY_INTEGER:
switch (tentry->type)
{
case REDIS_REPLY_INTEGER:
- result = string_
cat(result, string_sprintf("%d", tentry->integer)
);
+ result = string_
fmt_append(result, "%d", tentry->integer
);
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US tentry->str, tentry->len);
break;
case REDIS_REPLY_ARRAY:
DEBUG(D_lookup)
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US tentry->str, tentry->len);
break;
case REDIS_REPLY_ARRAY:
DEBUG(D_lookup)
- debug_printf("REDIS: result has nesting of arrays which"
+ debug_printf
_indent
("REDIS: result has nesting of arrays which"
" is not supported. Ignoring!\n");
break;
default:
" is not supported. Ignoring!\n");
break;
default:
- DEBUG(D_lookup) debug_printf(
+ DEBUG(D_lookup) debug_printf
_indent
(
"REDIS: result has unsupported type. Ignoring!\n");
break;
}
}
break;
default:
"REDIS: result has unsupported type. Ignoring!\n");
break;
}
}
break;
default:
- DEBUG(D_lookup) debug_printf("REDIS: query returned unsupported type\n");
+ DEBUG(D_lookup) debug_printf
_indent
("REDIS: query returned unsupported type\n");
break;
}
}
break;
}
}
@@
-357,7
+356,7
@@
if (result)
}
else
{
}
else
{
- DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+ DEBUG(D_lookup) debug_printf
_indent
("%s\n", *errmsg);
/* NOTE: Required to close connection since it needs to be reopened */
return yield; /* FAIL or DEFER */
}
/* NOTE: Required to close connection since it needs to be reopened */
return yield; /* FAIL or DEFER */
}