Complete cli script.

Small-Bodies-Node · Feb 26, 2023 · 497a98c · 497a98c
1 parent 850d75c
commit 497a98c
Show file tree

Hide file tree

Showing 13 changed files with 328 additions and 355 deletions.
diff --git a/.env-template b/.env-template
diff --git a/.gunicorn.config.py b/.gunicorn.config.py
diff --git a/_activate b/_activate
@@ -1,7 +1,7 @@
 #!/usr/bin/env false
 
 if [ ! -f $PWD/.env ]; then
-    echo -e "No .env file found!!!"
+    echo -e "No .env file found.  Generate with '_sbnsis env' then edit."
     return 1
 fi
 source .env

diff --git a/_develop_apis b/_develop_apis
@@ -1,17 +1,2 @@
 #! /bin/bash
-
-clear
-
-echo """
-==============================================
-    Running flask API in development mode.
-
-    API will be refreshed on code changes.
-
-    Logging is to console.
-==============================================
-"""
-
-sleep 2
-
-nodemon -w 'sbn_survey_image_service/**' -e py,yaml --exec python3 -m sbn_survey_image_service.api.app
+_sbnsis start --dev
diff --git a/_gunicorn_manager b/_gunicorn_manager
diff --git a/_initial_setup.sh b/_initial_setup.sh
@@ -2,7 +2,7 @@
 
 ### 0. Load vars defined in .env
 if [ ! -f $PWD/.env ]; then
-    echo -e "No .env file found!!!"
+    echo -e "No .env file found.  Generate with '_sbnsis env' then edit."
     return 1
 fi
 source .env

diff --git a/_sbnsis b/_sbnsis
@@ -0,0 +1,2 @@
+#!/bin/bash
+./.venv/bin/python3 -m sbn_survey_image_service.scripts.sbnsis $*
diff --git a/logging/logrotate.config b/logging/logrotate.config
@@ -1,6 +1,7 @@
 "*.log" {
     rotate 32
     ifempty
-    createolddir 770
+    createolddir 660
     olddir old-logs
+    missingok
 }
diff --git a/requirements.txt b/requirements.txt
@@ -10,5 +10,5 @@ pds4_tools==1.2
 sqlalchemy==1.3.5
 python-dotenv==0.14.0
 pytest-remotedata==0.3.2
-pytest-cov
+pytest-cov==3.0
 https://github.com/mkelley/pds3/archive/v0.2.3.tar.gz#egg=pds3
diff --git a/sbn_survey_image_service/__init__.py b/sbn_survey_image_service/__init__.py
@@ -1,11 +1,11 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """SBN Survey Image Service"""
-from . import models
-from . import services
-from . import env
-from . import exceptions
 
-# make cache directory, as needed
+# make cache directory set umask
+from . import exceptions
+from . import env
+from . import services
+from . import models
 import os
 os.system(f'mkdir -p {env.ENV.SBNSIS_CUTOUT_CACHE}')
 del os
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		./.venv/bin/python3 -m sbn_survey_image_service.scripts.sbnsis $*