forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wait do you have to commit to make dub to rebuild locally

This commit is contained in:
Adam D. Ruppe 2019-10-18 10:30:09 -04:00
parent e23e028f18
commit 27f284e9a8
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
http2.d
View File

@ -727,10 +727,10 @@ class HttpRequest {
} }
tryAgain: tryAgain:
auto got = Socket.select(readSet, writeSet, null, 10.seconds /* timeout */); auto selectGot = Socket.select(readSet, writeSet, null, 10.seconds /* timeout */);
if(got == 0) { /* timeout */ if(selectGot == 0) { /* timeout */
// timeout // timeout
} else if(got == -1) /* interrupted */ } else if(selectGot == -1) /* interrupted */
goto tryAgain; goto tryAgain;
else { /* ready */ else { /* ready */
Socket[16] inactive; Socket[16] inactive;

20
postgres.d
View File

@ -29,6 +29,7 @@ import std.exception;
class PostgreSql : Database { class PostgreSql : Database {
/// dbname = name is probably the most common connection string /// dbname = name is probably the most common connection string
this(string connectionString) { this(string connectionString) {
this.connectionString = connectionString;
conn = PQconnectdb(toStringz(connectionString)); conn = PQconnectdb(toStringz(connectionString));
if(conn is null) if(conn is null)
throw new DatabaseException("Unable to allocate PG connection object"); throw new DatabaseException("Unable to allocate PG connection object");
@ -37,6 +38,8 @@ class PostgreSql : Database {
query("SET NAMES 'utf8'"); // D does everything with utf8 query("SET NAMES 'utf8'"); // D does everything with utf8
} }
string connectionString;
~this() { ~this() {
PQfinish(conn); PQfinish(conn);
} }
@ -83,13 +86,30 @@ class PostgreSql : Database {
ResultSet queryImpl(string sql, Variant[] args...) { ResultSet queryImpl(string sql, Variant[] args...) {
sql = escapedVariants(this, sql, args); sql = escapedVariants(this, sql, args);
bool first_retry = true;
retry:
auto res = PQexec(conn, toStringz(sql)); auto res = PQexec(conn, toStringz(sql));
int ress = PQresultStatus(res); int ress = PQresultStatus(res);
// https://www.postgresql.org/docs/current/libpq-exec.html // https://www.postgresql.org/docs/current/libpq-exec.html
// FIXME: PQresultErrorField can get a lot more info in a more structured way // FIXME: PQresultErrorField can get a lot more info in a more structured way
if(ress != PGRES_TUPLES_OK if(ress != PGRES_TUPLES_OK
&& ress != PGRES_COMMAND_OK) && ress != PGRES_COMMAND_OK)
{
if(first_retry && error() == "no connection to the server\n") {
first_retry = false;
// try to reconnect...
PQfinish(conn);
conn = PQconnectdb(toStringz(connectionString));
if(conn is null)
throw new DatabaseException("Unable to allocate PG connection object");
if(PQstatus(conn) != CONNECTION_OK)
throw new DatabaseException(error());
goto retry;
}
throw new DatabaseException(error()); throw new DatabaseException(error());
}
return new PostgresResult(res); return new PostgresResult(res);
} }