2
0
mirror of https://github.com/frappe/bench.git synced 2024-09-24 13:09:01 +00:00

Merge pull request #789 from surajshetty3416/improve-cmd-perf

Revert "fix: Change ownership of all log and config files (#787)"
This commit is contained in:
Suraj Shetty 2019-04-13 00:03:25 +05:30 committed by GitHub
commit 7843edc8af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
import os, sys, shutil, subprocess, logging, itertools, requests, json, platform, select, pwd, grp, multiprocessing, hashlib, glob import os, sys, shutil, subprocess, logging, itertools, requests, json, platform, select, pwd, grp, multiprocessing, hashlib
from distutils.spawn import find_executable from distutils.spawn import find_executable
import bench import bench
import semantic_version import semantic_version
@ -556,6 +556,16 @@ def drop_privileges(uid_name='nobody', gid_name='nogroup'):
def fix_prod_setup_perms(bench_path='.', frappe_user=None): def fix_prod_setup_perms(bench_path='.', frappe_user=None):
from .config.common_site_config import get_config from .config.common_site_config import get_config
files = [
"logs/web.error.log",
"logs/web.log",
"logs/workerbeat.error.log",
"logs/workerbeat.log",
"logs/worker.error.log",
"logs/worker.log",
"config/nginx.conf",
"config/supervisor.conf",
]
if not frappe_user: if not frappe_user:
frappe_user = get_config(bench_path).get('frappe_user') frappe_user = get_config(bench_path).get('frappe_user')
@ -564,9 +574,8 @@ def fix_prod_setup_perms(bench_path='.', frappe_user=None):
print("frappe user not set") print("frappe user not set")
sys.exit(1) sys.exit(1)
globs = ["logs/*", "config/*"] for path in files:
for glob_name in globs: if os.path.exists(path):
for path in glob.glob(glob_name, recursive=True):
uid = pwd.getpwnam(frappe_user).pw_uid uid = pwd.getpwnam(frappe_user).pw_uid
gid = grp.getgrnam(frappe_user).gr_gid gid = grp.getgrnam(frappe_user).gr_gid
os.chown(path, uid, gid) os.chown(path, uid, gid)