From b56bd47f911be1cd3b2c627110c5d2b0ca599ae3 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Wed, 14 Jan 2015 12:23:45 +0530 Subject: [PATCH] fixed info message bug --- ee/cli/plugins/site.py | 9 +++------ ee/core/services.py | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index df29d550..b0b69962 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -11,6 +11,8 @@ from ee.core.git import EEGit import sys import os import glob +import subprocess +from subprocess import Popen def ee_site_hook(app): @@ -23,13 +25,8 @@ class EESiteController(CementBaseController): label = 'site' stacked_on = 'base' stacked_type = 'nested' -<<<<<<< HEAD - description = ('''site command manages website configuration - with the help of the following subcommands''') -======= description = ('site command manages website configuration' ' with the help of the following subcommands') ->>>>>>> 78782f7a7595c1e9d9c8e041c9f081e331f156f8 arguments = [ (['site_name'], dict(help='website name')), @@ -157,7 +154,7 @@ class EESiteController(CementBaseController): if os.path.isfile('/etc/nginx/sites-available/{0}' .format(ee_domain)): ee_site_webroot = EEVariables.ee_webroot + ee_domain - EEFileutils.chdir(self, ee_site_webroot) + EEFileUtils.chdir(self, ee_site_webroot) try: subprocess.call(['bash']) except OSError as e: diff --git a/ee/core/services.py b/ee/core/services.py index 97cea2d3..b8c3ee0f 100644 --- a/ee/core/services.py +++ b/ee/core/services.py @@ -59,11 +59,11 @@ class EEService(): if retcode[0] == 0: subprocess.getstatusoutput('service {0} reload' .format(service_name)) - Log.info("reload : {0} [OK]" + Log.info(self, "reload : {0} [OK]" .format(service_name)) return True else: - Log.error("reload : {0} [FAIL]" + Log.error(self, "reload : {0} [FAIL]" .format(service_name)) Log.debug("{0}" .format(retcode[1]))