author | Michael Krelin <hacker@klever.net> | 2007-04-22 23:23:39 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-04-22 23:23:39 (UTC) |
commit | d63aa3793906423bd3bffe6ab55578c162bfbbda (patch) (unidiff) | |
tree | 575b6dd5d44cf5166d42b62b59f7c0623c614fc6 /net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch | |
parent | 4243b8fe439f0f819b797d908345bd8ffc067ead (diff) | |
download | misc-d63aa3793906423bd3bffe6ab55578c162bfbbda.zip misc-d63aa3793906423bd3bffe6ab55578c162bfbbda.tar.gz misc-d63aa3793906423bd3bffe6ab55578c162bfbbda.tar.bz2 |
net-im/jabberd: imported from portage
Diffstat (limited to 'net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch b/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch new file mode 100644 index 0000000..75f0a01 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | --- xdb_sql/xdb_sql.c 2006/03/15 22:16:371210 | ||
2 | +++ xdb_sql/xdb_sql.c 2006/04/25 22:01:391211 | ||
3 | @@ -269,10 +269,18 @@ | ||
4 | ret = mysql_query(xq->mysql, query); | ||
5 | |||
6 | /* failed and we need to reconnect? */ | ||
7 | - if (ret == CR_SERVER_LOST || ret == CR_SERVER_GONE_ERROR) { | ||
8 | -xdb_sql_mysql_connect(i, xq); | ||
9 | + if (ret) { | ||
10 | +unsigned int query_errno = mysql_errno(xq->mysql); | ||
11 | +if (query_errno == CR_SERVER_LOST || query_errno == CR_SERVER_GONE_ERROR) { | ||
12 | + log_debug2(ZONE, LOGT_STORAGE, "connection lost, trying to reconnect to MySQL server"); | ||
13 | + xdb_sql_mysql_connect(i, xq); | ||
14 | |||
15 | -ret = mysql_query(xq->mysql, query); | ||
16 | + ret = mysql_query(xq->mysql, query); | ||
17 | + | ||
18 | + if (ret == 0) { | ||
19 | + log_notice(i->id, "connection to MySQL server %s:%i had been lost, and has been reestablished", xq->mysql_host , xq->mysql_port); | ||
20 | + } | ||
21 | +} | ||
22 | } | ||
23 | |||
24 | /* still an error? log and return */ | ||