Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

align abstract socket address syntax to new capnp

Browse Source
This commit is contained in:
Oliver Giles 2017-08-12 15:22:32 +03:00
parent c12fb3f030
commit 56d2f30976
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.cpp
View File

@ -71,15 +71,13 @@ static int setParams(int argc, char** argv, T& request) {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
// TODO: pass this through an enviroment variable set by laminard
const char* address = "unix:\0laminar";
if(argc < 2) { if(argc < 2) {
fprintf(stderr, "Usage: %s <command> [parameters...]\n", argv[0]); fprintf(stderr, "Usage: %s <command> [parameters...]\n", argv[0]);
return EINVAL; return EINVAL;
} }
int ret = 0; int ret = 0;
const char* address = getenv("LAMINAR_HOST") ?: "unix-abstract:laminar";
capnp::EzRpcClient client(address); capnp::EzRpcClient client(address);
LaminarCi::Client laminar = client.getMain<LaminarCi>(); LaminarCi::Client laminar = client.getMain<LaminarCi>();

2
src/laminar.cpp
View File

@ -55,7 +55,7 @@ template<> Json& Json::set(const char* key, time_t value) { String(key); Int64(v
namespace { namespace {
// Default values when none were supplied in $LAMINAR_CONF_FILE (/etc/laminar.conf) // Default values when none were supplied in $LAMINAR_CONF_FILE (/etc/laminar.conf)
constexpr const char* INTADDR_RPC_DEFAULT = "unix:\0laminar"; constexpr const char* INTADDR_RPC_DEFAULT = "unix-abstract:laminar";
constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080"; constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080";
constexpr const char* ARCHIVE_URL_DEFAULT = "/archive"; constexpr const char* ARCHIVE_URL_DEFAULT = "/archive";
} }