Skip to content
Snippets Groups Projects
Commit 237f97d0 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/stable'

Merge gh-180 - ip address in log/title.

Null-merge since we use URI in 1.6

Conflicts:
	src/evio.cc
	src/tarantool.cc
parents 7619d4ff 56dc3f7d
No related merge requests found
......@@ -63,6 +63,8 @@ struct evio_service
{
/** Service name. E.g. 'primary', 'secondary', etc. */
char name[SERVICE_NAME_MAXLEN];
/** Bind IP address, useful for logging */
char host[SERVICE_NAME_MAXLEN];
/** Interface/port to bind to */
struct uri port;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment