fix server

.gitignore

@@ -0,0 +1,3 @@
+build/*
+dist/*
+*egg-info*

pygeoweaver/main.py

@@ -0,0 +1,14 @@
+"""
+The main function of pygeoweaver
+To run in CLI mode. 
+"""
+from server import start, stop
+
+def main():
+ # start geoweaver
+ #start()
+ # stop geoweaver
+ stop()
+
+if __name__ == "__main__":
+ main()

pygeoweaver/server.py

@@ -1,5 +1,6 @@
-
+import os
 import subprocess
+from utils import get_root_dir
 
 """
 This module provides function to start and stop Geoweaver server.
@@ -17,16 +18,14 @@ def download_geoweaver():
 
 def start():
  print("start Geoweaver instance..")
- result = subprocess.run(['start.sh'], capture_output=True, text=True)
- print(result.stdout)
- print(result.stderr)
+ result = subprocess.run(['./start.sh'], cwd=f"{get_root_dir()}/")
+
 
 
 def stop():
  print("stop Geoweaver instance..")
- result = subprocess.run(['stop.sh'], capture_output=True, text=True)
- print(result.stdout)
- print(result.stderr)
+ result = subprocess.run(['./stop.sh'], cwd=f"{get_root_dir()}/", shell=True)
+
 
 
 

pygeoweaver/start.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
+echo "Stop running Geoweaver if any.."
+pkill -f geoweaver
+
 FILE=~/geoweaver.jar
 if [ -f "$FILE" ]; then
- echo "$FILE exists. Skip downloading.."
-else
- echo "Downloading the latest geoweaver.jar to user home directory"
- cd ~ && curl -OL https://github.com/ESIPFed/Geoweaver/releases/download/latest/geoweaver.jar
+ echo "$FILE exists. Remove.."
+ rm -f $FILE
 fi
 
-echo "Stop running Geoweaver if any.."
-kill $(ps aux | grep 'geoweaver.jar' | awk '{print $2}')
+echo "Downloading the latest geoweaver.jar to user home directory"
+cd ~ && curl -OL https://github.com/ESIPFed/Geoweaver/releases/download/latest/geoweaver.jar
 
 echo "Start Geoweaver.."
 nohup java -jar ~/geoweaver.jar > ~/geoweaver.log &
@@ -23,6 +24,7 @@ do
  ((counter++))
 done
 
+cat ~/geoweaver.log
 if [ $counter == 20 ] ; then
  echo "Error: Geoweaver is not up"
  exit 1

pygeoweaver/stop.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
-
-
+echo "Stop running Geoweaver if any.."
+pkill -f geoweaver
+STATUS=$(curl -s -o /dev/null -w "%{http_code}\n" "http:https://localhost:8070/Geoweaver")
+if [ $STATUS != 302 ]; then
+ echo "Stopped."
+ exit 0
+else
+ echo "Error: unable to stop."
+ exit 1
+fi
 

pygeoweaver/utils.py

@@ -0,0 +1,6 @@
+import os
+
+def get_root_dir():
+ print(os.path.basename(__file__))
+ head, tail = os.path.split(__file__)
+ return head

pyproject.toml

@@ -1,11 +1,10 @@
 [build-system]
-requires = [
-
-]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygeoweaver"
-version = "0.0.1"
+version = "0.6.0"
 authors = [
  { name="Geoweaver team", email="[email protected]" },
 ]