summaryrefslogtreecommitdiffstats
path: root/xlators/features/changelog/lib
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-02-11 14:02:43 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-02-11 14:02:43 +0000
commit0d92798e88c5444fb2cc23663b4ea9a345887756 (patch)
treea71f336115753242e8690547f403405a3373ddf1 /xlators/features/changelog/lib
parent33939dcde38389373e7ed8b12c6e9916b39411d0 (diff)
parent408d50a64b7b3a9d6a4899060baa423ff126cc5f (diff)
Merge remote-tracking branch 'upstream/master'
Conflicts: xlators/mgmt/glusterd/src/Makefile.am Change-Id: Ida5ec4aecc358cb2268bdfdb1a8c9bab750f9575
Diffstat (limited to 'xlators/features/changelog/lib')
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-helpers.h2
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/xlators/features/changelog/lib/src/gf-changelog-helpers.h b/xlators/features/changelog/lib/src/gf-changelog-helpers.h
index f35220ccb..e4cf506c4 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-helpers.h
+++ b/xlators/features/changelog/lib/src/gf-changelog-helpers.h
@@ -51,7 +51,7 @@ typedef struct gf_changelog {
/* connection retries */
int gfc_connretries;
- char gfc_sockpath[PATH_MAX];
+ char gfc_sockpath[UNIX_PATH_MAX];
char gfc_brickpath[PATH_MAX];
diff --git a/xlators/features/changelog/lib/src/gf-changelog.c b/xlators/features/changelog/lib/src/gf-changelog.c
index ca8e373e7..4b2b25ad5 100644
--- a/xlators/features/changelog/lib/src/gf-changelog.c
+++ b/xlators/features/changelog/lib/src/gf-changelog.c
@@ -173,7 +173,7 @@ gf_changelog_notification_init (xlator_t *this, gf_changelog_t *gfc)
}
CHANGELOG_MAKE_SOCKET_PATH (gfc->gfc_brickpath,
- gfc->gfc_sockpath, PATH_MAX);
+ gfc->gfc_sockpath, UNIX_PATH_MAX);
gf_log (this->name, GF_LOG_INFO,
"connecting to changelog socket: %s (brick: %s)",
gfc->gfc_sockpath, gfc->gfc_brickpath);
@@ -202,6 +202,7 @@ gf_changelog_notification_init (xlator_t *this, gf_changelog_t *gfc)
gf_log (this->name, GF_LOG_ERROR,
"could not connect to changelog socket!"
" bailing out...");
+ close (sockfd);
ret = -1;
} else
gf_log (this->name, GF_LOG_INFO,