droonga/droonga-http-server at ac577a5 [master] Use old startup script instead of systemd for now, for CentOS 7 (Groonga-commit) - Groonga - fulltext search engine.

YUKI Hiroshi	2014-09-25 16:39:39 +0900 (Thu, 25 Sep 2014)

  New Revision: ac577a5fb44fe9825defc017a1ea02098826b8d6
  https://github.com/droonga/droonga-http-server/commit/ac577a5fb44fe9825defc017a1ea02098826b8d6

  Message:
    Use old startup script instead of systemd for now, for CentOS 7

  Modified files:
    bin/droonga-http-server-configure
    install/centos/droonga-http-server

  Modified: bin/droonga-http-server-configure (+6 -2)
===================================================================

--- bin/droonga-http-server-configure    2014-09-25 12:54:07 +0900 (6578246)
+++ bin/droonga-http-server-configure    2014-09-25 16:39:39 +0900 (ab951e7)
@@ -48,9 +48,10 @@ function checkInstalledAsService() {
     if (!serviceUserName)
       return resolve(installedAsService);
 
+    //TODO: we should support systemd also...
     exec('service droonga-http-server status', function(error, stdin, stdout) {
       if (error) {
-        exec('env SYSTEMCTL_SKIP_REDIRECT=yes service droonga-http-server status', function(error, stdin, stdout) {
+        exec('service droonga-http-server status', function(error, stdin, stdout) {
           installedAsService = stdin.indexOf('running') > -1 ||
                                  stdin.indexOf('droonga-http-server is stopped') > -1 ||
                                  stdin.indexOf('droonga-http-server dead') > -1;
@@ -85,7 +86,8 @@ function ensureHaveWritePermission() {
 function checkRunningStatus() {
   return Q.Promise(function(resolve, reject, notify) {
     if (installedAsService) {
-      exec('env SYSTEMCTL_SKIP_REDIRECT=yes service droonga-http-server status',
+      //TODO: we should support systemd also...
+      exec('service droonga-http-server status',
            function(error, stdin, stdout) {
              running = !error && stdin.indexOf('running') > -1;
              resolve(running);
@@ -123,6 +125,7 @@ function ensureServiceStopped() {
 function stopService() {
   return Q.Promise(function(resolve, reject, notify) {
     if (installedAsService) {
+      //TODO: we should support systemd also...
       exec('service droonga-http-server stop',
            function(error, stdin, stdout) {
              resolve();
@@ -137,6 +140,7 @@ function stopService() {
 function startService() {
   return Q.Promise(function(resolve, reject, notify) {
     if (installedAsService) {
+      //TODO: we should support systemd also...
       exec('service droonga-http-server start',
            function(error, stdin, stdout) {
              resolve();

  Modified: install/centos/droonga-http-server (+3 -0)
===================================================================
--- install/centos/droonga-http-server    2014-09-25 12:54:07 +0900 (e6c03ee)
+++ install/centos/droonga-http-server    2014-09-25 16:39:39 +0900 (bce7b00)
@@ -5,6 +5,9 @@
 #	<A HTTP Protocol Adapter for Droonga>
 # chkconfig: 2345 20 80
 
+# TODO: we have to migrate to systemd based management in near future...
+export SYSTEMCTL_SKIP_REDIRECT=yes
+
 # Source function library.
 . /etc/init.d/functions
 
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-http-server at ac577a5 [master] Use old startup script instead of systemd for now, for CentOS 7