Commit 1cabf94a authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: views.py cleaned from old process.py functions

parent b293c320
...@@ -7,13 +7,13 @@ import json ...@@ -7,13 +7,13 @@ import json
import os import os
import shutil import shutil
import subprocess import subprocess
import sup_process
import thread import thread
import urllib import urllib
from flask import (Flask, request, redirect, url_for, render_template, from flask import (Flask, request, redirect, url_for, render_template,
g, flash, jsonify, session, abort, send_file) g, flash, jsonify, session, abort, send_file)
from slapos.runner.process import killRunningProcess
from slapos.runner.utils import (checkSoftwareFolder, configNewSR, from slapos.runner.utils import (checkSoftwareFolder, configNewSR,
createNewUser, getBuildAndRunParams, createNewUser, getBuildAndRunParams,
getProfilePath, getSlapgridResult, getProfilePath, getSlapgridResult,
...@@ -478,7 +478,7 @@ def slapgridResult(): ...@@ -478,7 +478,7 @@ def slapgridResult():
def stopSlapgrid(): def stopSlapgrid():
counter_file = os.path.join(app.config['runner_workdir'], '.turn-left') counter_file = os.path.join(app.config['runner_workdir'], '.turn-left')
open(counter_file, 'w+').write(str(0)) open(counter_file, 'w+').write(str(0))
result = killRunningProcess(request.form['type']) result = sup_process.killRunningProcess(app.config, request.form['type'])
return jsonify(result=result) return jsonify(result=result)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment