sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Avoid python hangs when run in headless mode from FCGI

Browse Source
This commit is contained in:
elpaso 2014-10-03 10:35:07 +02:00
parent 0d5fb236ba
commit 59ec15bb2b
11 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/algs/gdal/GdalUtils.py
View File

@ -73,7 +73,7 @@ class GdalUtils:
fused_command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=False,
).stdout

4
python/plugins/processing/algs/grass/GrassUtils.py
View File

@ -270,7 +270,7 @@ class GrassUtils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout
@ -299,7 +299,7 @@ class GrassUtils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout

4
python/plugins/processing/algs/grass7/Grass7Utils.py
View File

@ -272,7 +272,7 @@ class Grass7Utils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout
@ -301,7 +301,7 @@ class Grass7Utils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout

2
python/plugins/processing/algs/lidar/fusion/FusionUtils.py
View File

@ -67,7 +67,7 @@ class FusionUtils:
commands,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=False,
).stdout

2
python/plugins/processing/algs/lidar/lastools/LAStoolsUtils.py
View File

@ -46,7 +46,7 @@ class LAStoolsUtils:
loglines = []
loglines.append("LAStools console output")
commandline = " ".join(commands)
proc = subprocess.Popen(commandline, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
proc = subprocess.Popen(commandline, shell=True, stdout=subprocess.PIPE, stdin=open(os.devnull),
stderr=subprocess.STDOUT, universal_newlines=False).stdout
for line in iter(proc.readline, ""):
loglines.append(line)

2
python/plugins/processing/algs/otb/OTBUtils.py
View File

@ -131,7 +131,7 @@ class OTBUtils:
loglines.append("OTB execution console output")
os.putenv('ITK_AUTOLOAD_PATH', OTBUtils.otbLibPath())
fused_command = ''.join(['"%s" ' % c for c in commands])
proc = subprocess.Popen(fused_command, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT, universal_newlines=True).stdout
proc = subprocess.Popen(fused_command, shell=True, stdout=subprocess.PIPE, stdin=open(os.devnull),stderr=subprocess.STDOUT, universal_newlines=True).stdout
for line in iter(proc.readline, ""):
if "[*" in line:
idx = line.find("[*")

4
python/plugins/processing/algs/r/RUtils.py
View File

@ -103,7 +103,7 @@ class RUtils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
)
@ -171,7 +171,7 @@ class RUtils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout

4
python/plugins/processing/algs/saga/SagaDescriptionCreator.py
View File

@ -41,7 +41,7 @@ class SagaDescriptionCreator:
command,
shell=True,
stdout=f2,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
)
@ -77,7 +77,7 @@ class SagaDescriptionCreator:
command,
shell=True,
stdout=f,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=f,
universal_newlines=True,
)

2
python/plugins/processing/algs/saga/SagaUtils.py
View File

@ -128,7 +128,7 @@ class SagaUtils:
command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout

2
python/plugins/processing/algs/taudem/TauDEMUtils.py
View File

@ -86,7 +86,7 @@ class TauDEMUtils:
fused_command,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stdin=open(os.devnull),
stderr=subprocess.STDOUT,
universal_newlines=True,
).stdout

21
python/plugins/processing/core/Processing.py
View File

@ -323,13 +323,14 @@ class Processing:
print 'Warning: Not all input layers use the same CRS.\n' \
+ 'This can cause unexpected results.'
# Don't set the wait cursor twice, because then when you
# restore it, it will still be a wait cursor.
cursor = QApplication.overrideCursor()
if cursor is None or cursor == 0:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
elif cursor.shape() != Qt.WaitCursor:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
if iface is not None:
# Don't set the wait cursor twice, because then when you
# restore it, it will still be a wait cursor.
cursor = QApplication.overrideCursor()
if cursor is None or cursor == 0:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
elif cursor.shape() != Qt.WaitCursor:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
progress = None
if iface is not None :
@ -337,6 +338,8 @@ class Processing:
ret = runalg(alg, progress)
if onFinish is not None and ret:
onFinish(alg, progress)
QApplication.restoreOverrideCursor()
progress.close()
if iface is not None:
QApplication.restoreOverrideCursor()
progress.close()
return alg