mirror of https://gitlab.com/pamhyr/pamhyr2
Solver: Switch to logging.
parent
2f78432005
commit
0a414f4065
|
|
@ -1,6 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import logging
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from signal import SIGTERM, SIGSTOP, SIGCONT
|
from signal import SIGTERM, SIGSTOP, SIGCONT
|
||||||
|
|
@ -12,6 +13,8 @@ from enum import Enum
|
||||||
|
|
||||||
from Model.Except import NotImplementedMethodeError
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
class STATUS(Enum):
|
class STATUS(Enum):
|
||||||
NOT_LAUNCHED = -1
|
NOT_LAUNCHED = -1
|
||||||
STOPED = 0
|
STOPED = 0
|
||||||
|
|
@ -159,7 +162,7 @@ class AbstractSolver(object):
|
||||||
cmd = cmd.replace("@input", self.input_param())
|
cmd = cmd.replace("@input", self.input_param())
|
||||||
cmd = cmd.replace("@dir", self._process.workingDirectory())
|
cmd = cmd.replace("@dir", self._process.workingDirectory())
|
||||||
|
|
||||||
print(f"! {cmd}")
|
logger.debug(f"! {cmd}")
|
||||||
|
|
||||||
cmd = cmd.split()
|
cmd = cmd.split()
|
||||||
exe = cmd[0]
|
exe = cmd[0]
|
||||||
|
|
@ -172,7 +175,6 @@ class AbstractSolver(object):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def run_solver(self):
|
def run_solver(self):
|
||||||
print("run solver")
|
|
||||||
if self._cmd_solver == "":
|
if self._cmd_solver == "":
|
||||||
self._run_next()
|
self._run_next()
|
||||||
return True
|
return True
|
||||||
|
|
@ -182,7 +184,7 @@ class AbstractSolver(object):
|
||||||
cmd = cmd.replace("@input", self.input_param())
|
cmd = cmd.replace("@input", self.input_param())
|
||||||
cmd = cmd.replace("@dir", self._process.workingDirectory())
|
cmd = cmd.replace("@dir", self._process.workingDirectory())
|
||||||
|
|
||||||
print(f"! {cmd}")
|
logger.debug(f"! {cmd}")
|
||||||
|
|
||||||
cmd = cmd.split()
|
cmd = cmd.split()
|
||||||
exe = cmd[0]
|
exe = cmd[0]
|
||||||
|
|
@ -205,7 +207,7 @@ class AbstractSolver(object):
|
||||||
cmd = cmd.replace("@input", self.input_param())
|
cmd = cmd.replace("@input", self.input_param())
|
||||||
cmd = cmd.replace("@dir", self._process.workingDirectory())
|
cmd = cmd.replace("@dir", self._process.workingDirectory())
|
||||||
|
|
||||||
print(f"! {cmd}")
|
logger.debug(f"! {cmd}")
|
||||||
|
|
||||||
cmd = cmd.split()
|
cmd = cmd.split()
|
||||||
exe = cmd[0]
|
exe = cmd[0]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue