Fixed stopping main server from console

maloja/__pkginfo__.py

@@ -5,7 +5,7 @@ author = {
 	"email":"maloja@krateng.dev",
 	"github": "krateng"
 }
-version = 2,3,3
+version = 2,3,4
 versionstr = ".".join(str(n) for n in version)
 links = {
 	"pypi":"malojaserver",

maloja/controller.py

@@ -126,20 +126,25 @@ def stop():
 	pid_sv = getInstanceSupervisor()
 	if pid_sv is not None:
 		os.kill(pid_sv,signal.SIGTERM)
-		return True
+#		return True
 
-	else:
-		print("Server is not running")
-		return False
-
-#	pid = getInstance()
-#	if pid is None:
+#	else:
 #		print("Server is not running")
 #		return False
+
+
+	pid = getInstance()
+	if pid is not None:
+#		print("Server is not running")
+#		return False
+#		pass
 #	else:
-#		os.kill(pid,signal.SIGTERM)
+		os.kill(pid,signal.SIGTERM)
 #		print("Maloja stopped! PID: " + str(pid))
+	if pid is not None or pid_sv is not None:
 		return True
+	else:
+		return False
 
 
 def loadlastfm(filename):

maloja/supervisor.py

@@ -31,7 +31,6 @@ def update():
 def start():
 	try:
 		p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
-		log(p,module="supervisor")
 
 	except e:
 		log("Error starting Maloja: " + str(e),module="supervisor")