This commit is contained in:
flaskfarm
2022-10-14 14:49:10 +09:00
parent 8f61887ba6
commit 6953d43fe3
4 changed files with 6 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
VERSION="4.0.0"
from .init_main import Framework from .init_main import Framework
from .version import VERSION
frame = Framework.get_instance() frame = Framework.get_instance()
F = frame F = frame

View File

@@ -4,7 +4,7 @@ import traceback
from flask import jsonify, redirect, request, send_from_directory from flask import jsonify, redirect, request, send_from_directory
from flask_login import login_required from flask_login import login_required
from framework import VERSION, F from framework import F
@F.app.route('/global/ajax/<sub>', methods=['GET', 'POST']) @F.app.route('/global/ajax/<sub>', methods=['GET', 'POST'])
@@ -91,6 +91,7 @@ def home():
@F.app.route("/version") @F.app.route("/version")
def get_version(): def get_version():
from .version import VERSION
return VERSION return VERSION
@F.app.route("/open/<path:path>") @F.app.route("/open/<path:path>")

1
lib/framework/version.py Normal file
View File

@@ -0,0 +1 @@
VERSION="4.0.0"

View File

@@ -132,9 +132,9 @@ class SupportSubprocess(object):
self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8')
else: else:
if self.uid == None: if self.uid == None:
process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8')
else: else:
process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8') process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8')
SupportSubprocess.instance_list.append(self) SupportSubprocess.instance_list.append(self)
self.start_communicate() self.start_communicate()
self.start_send_callback() self.start_send_callback()