From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v7 15/19] index-helper: don't run if already running
Date: Fri, 29 Apr 2016 21:02:09 -0400 [thread overview]
Message-ID: <1461978133-13966-16-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1461978133-13966-1-git-send-email-dturner@twopensource.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
index-helper.c | 7 +++++++
t/t7900-index-helper.sh | 9 +++++++++
2 files changed, 16 insertions(+)
diff --git a/index-helper.c b/index-helper.c
index 9ca2ca6..e8d1311 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -455,6 +455,13 @@ int main(int argc, char **argv)
return 0;
}
+ /* check that no other copy is running */
+ fd = unix_stream_connect(git_path("index-helper.sock"));
+ if (fd > 0)
+ die(_("Already running"));
+ if (errno != ECONNREFUSED && errno != ENOENT)
+ die_errno(_("Unexpected error checking socket"));
+
atexit(cleanup);
sigchain_push_common(cleanup_on_signal);
diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
index e71b5af..7159971 100755
--- a/t/t7900-index-helper.sh
+++ b/t/t7900-index-helper.sh
@@ -29,4 +29,13 @@ test_expect_success 'index-helper creates usable path file and can be killed' '
test_path_is_missing .git/index-helper.sock
'
+test_expect_success 'index-helper will not start if already running' '
+ test_when_finished "git index-helper --kill" &&
+ git index-helper --detach &&
+ test -S .git/index-helper.sock &&
+ test_must_fail git index-helper 2>err &&
+ test -S .git/index-helper.sock &&
+ grep "Already running" err
+'
+
test_done
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-04-30 1:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-30 1:01 [PATCH v7 00/19] index-helper/watchman David Turner
2016-04-30 1:01 ` [PATCH v7 01/19] read-cache.c: fix constness of verify_hdr() David Turner
2016-04-30 1:01 ` [PATCH v7 02/19] read-cache: allow to keep mmap'd memory after reading David Turner
2016-04-30 1:01 ` [PATCH v7 03/19] index-helper: new daemon for caching index and related stuff David Turner
2016-04-30 1:01 ` [PATCH v7 04/19] index-helper: add --strict David Turner
2016-04-30 1:01 ` [PATCH v7 05/19] index-helper: log warnings David Turner
2016-04-30 1:02 ` [PATCH v7 06/19] daemonize(): set a flag before exiting the main process David Turner
2016-04-30 1:02 ` [PATCH v7 07/19] index-helper: add --detach David Turner
2016-04-30 1:02 ` [PATCH v7 08/19] read-cache: add watchman 'WAMA' extension David Turner
2016-04-30 1:02 ` [PATCH v7 09/19] Add watchman support to reduce index refresh cost David Turner
2016-04-30 1:02 ` [PATCH v7 10/19] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-04-30 1:02 ` [PATCH v7 11/19] update-index: enable/disable watchman support David Turner
2016-04-30 1:02 ` [PATCH v7 12/19] unpack-trees: preserve index extensions David Turner
2016-04-30 1:02 ` [PATCH v7 13/19] watchman: add a config option to enable the extension David Turner
2016-04-30 1:02 ` [PATCH v7 14/19] index-helper: kill mode David Turner
2016-04-30 1:02 ` David Turner [this message]
2016-04-30 1:02 ` [PATCH v7 16/19] index-helper: autorun mode David Turner
2016-04-30 1:02 ` [PATCH v7 17/19] index-helper: optionally automatically run David Turner
2016-04-30 1:02 ` [PATCH v7 18/19] Add tracing to measure where most of the time is spent David Turner
2016-04-30 1:02 ` [PATCH v7 19/19] untracked-cache: config option David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461978133-13966-16-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).