forked from iarv/meshview
* Add alembic DB schema management (#86) * Use alembic * add creation helper * example migration tool * Store UTC int time in DB (#81) * use UTC int time * Remove old index notes script -- no longer needed * modify alembic to support cleaner migrations * add /version json endpoint * move technical docs * remove old migrate script * add readme in docs: * more doc tidy * rm * update api docs * ignore other database files * health endpoint * alembic log format * break out api calls in to their own file to reduce footprint * ruff and docs * vuln * Improves arguments in mvrun.py * Set dbcleanup.log location configurable * mvrun work * fallback if missing config * remove unused loop * improve migrations and fix logging problem with mqtt * Container using slim/uv * auto build containers * symlink * fix symlink * checkout and containerfile * make /app owned by ap0p * Traceroute Return Path logged and displayed (#97) * traceroute returns are now logged and /packetlist now graphs the correct data for a return route * now using alembic to update schema * HOWTO - Alembic --------- Co-authored-by: Joel Krauska <jkrauska@gmail.com> * DB Backups * backups and cleanups are different * ruff * Docker Docs * setup-dev * graphviz for dot in Container * Summary of 3.0.0 stuff * Alembic was blocking mqtt logs * Add us first/last timestamps to node table too * Worked on /api/packet. Needed to modify - Store.py to read the new time data - api.py to present the new time data - firehose.html chat.html and map.html now use the new apis and the time is the browser local time * Worked on /api/packet. Needed to modify - Store.py to read the new time data - api.py to present the new time data - firehose.html chat.html and map.html now use the new apis and the time is the browser local time * Improves container build (#94) * Worked on /api/packet. Needed to modify - Store.py to read the new time data - api.py to present the new time data - firehose.html chat.html and map.html now use the new apis and the time is the browser local time * Worked on /api/packet. Needed to modify - Store.py to read the new time data - api.py to present the new time data - firehose.html chat.html and map.html now use the new apis and the time is the browser local time * Worked on /api/packet. Needed to modify - Added new api endpoint /api/packets_seen - Modified web.py and store.py to support changes to APIs. - Started to work on new_node.html and new_packet.html for presentation of data. * Worked on /api/packet. Needed to modify - Added new api endpoint /api/packets_seen - Modified web.py and store.py to support changes to APIs. - Started to work on new_node.html and new_packet.html for presentation of data. * Finishing up all the pages for the 3.0 release. Now all pages are functional. * Finishing up all the pages for the 3.0 release. Now all pages are functional. * fix ruff format * more ruff * Finishing up all the pages for the 3.0 release. Now all pages are functional. * Finishing up all the pages for the 3.0 release. Now all pages are functional. * pyproject.toml requirements * use sys.executable * fix 0 epoch dates in /chat * Make the robots do our bidding * another compatibility fix when _us is empty and we need to sort by BOTH old and new * Finishing up all the pages for the 3.0 release. Now all pages are functional. * Finishing up all the pages for the 3.0 release. Now all pages are functional. * Remamed new_node to node. shorter and descriptive. * Remamed new_node to node. shorter and descriptive. * Remamed new_node to node. shorter and descriptive. * Remamed new_node to node. shorter and descriptive. * Remamed new_node to node. shorter and descriptive. * Remamed new_node to node. shorter and descriptive. * More changes... almost ready for release. Ranamed 2 pages for easy or reading. * Fix the net page as it was not showing the date information * Fix the net page as it was not showing the date information * Fix the net page as it was not showing the date information * Fix the net page as it was not showing the date information * ruff --------- Co-authored-by: Óscar García Amor <ogarcia@connectical.com> Co-authored-by: Jim Schrempp <jschrempp@users.noreply.github.com> Co-authored-by: Pablo Revilla <pablorevilla@gmail.com>
140 lines
4.4 KiB
Python
140 lines
4.4 KiB
Python
import argparse
|
|
import logging
|
|
import os
|
|
import signal
|
|
import subprocess
|
|
import sys
|
|
import threading
|
|
|
|
logging.basicConfig(
|
|
level=logging.INFO,
|
|
format="%(asctime)s %(filename)s:%(lineno)d [pid:%(process)d] %(levelname)s - %(message)s",
|
|
datefmt="%Y-%m-%d %H:%M:%S",
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Global list to track running processes
|
|
running_processes = []
|
|
pid_files = []
|
|
|
|
|
|
def cleanup_pid_file(pid_file):
|
|
"""Remove a PID file if it exists"""
|
|
if os.path.exists(pid_file):
|
|
try:
|
|
os.remove(pid_file)
|
|
logger.info(f"Removed PID file {pid_file}")
|
|
except Exception as e:
|
|
logger.error(f"Error removing PID file {pid_file}: {e}")
|
|
|
|
|
|
def signal_handler(sig, frame):
|
|
"""Handle Ctrl-C gracefully"""
|
|
logger.info("Received interrupt signal (Ctrl-C), shutting down gracefully...")
|
|
|
|
# Terminate all running processes
|
|
for process in running_processes:
|
|
if process and process.poll() is None: # Process is still running
|
|
try:
|
|
logger.info(f"Terminating process PID {process.pid}")
|
|
process.terminate()
|
|
# Give it a moment to terminate gracefully
|
|
try:
|
|
process.wait(timeout=5)
|
|
logger.info(f"Process PID {process.pid} terminated successfully")
|
|
except subprocess.TimeoutExpired:
|
|
logger.warning(f"Process PID {process.pid} did not terminate, forcing kill")
|
|
process.kill()
|
|
process.wait()
|
|
except Exception as e:
|
|
logger.error(f"Error terminating process PID {process.pid}: {e}")
|
|
|
|
# Clean up PID files
|
|
for pid_file in pid_files:
|
|
cleanup_pid_file(pid_file)
|
|
|
|
logger.info("Shutdown complete")
|
|
sys.exit(0)
|
|
|
|
|
|
# Run python in subprocess
|
|
def run_script(python_executable, script_name, pid_file, *args):
|
|
process = None
|
|
try:
|
|
# Combine the script name and arguments
|
|
command = [python_executable, '-u', script_name] + list(args)
|
|
|
|
# Run the subprocess (output goes directly to console for real-time viewing)
|
|
process = subprocess.Popen(command)
|
|
|
|
# Track the process globally
|
|
running_processes.append(process)
|
|
|
|
# Write PID to file
|
|
with open(pid_file, 'w') as f:
|
|
f.write(str(process.pid))
|
|
logger.info(f"Started {script_name} with PID {process.pid}, written to {pid_file}")
|
|
|
|
# Wait for the process to complete
|
|
process.wait()
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error running {script_name}: {e}")
|
|
finally:
|
|
# Clean up PID file when process exits
|
|
cleanup_pid_file(pid_file)
|
|
|
|
|
|
# Parse runtime argument (--config) and start subprocess threads
|
|
def main():
|
|
# Register signal handler for Ctrl-C
|
|
signal.signal(signal.SIGINT, signal_handler)
|
|
signal.signal(signal.SIGTERM, signal_handler)
|
|
|
|
parser = argparse.ArgumentParser(
|
|
description="Helper script to run the database and web frontend in separate threads."
|
|
)
|
|
|
|
# Add --config runtime argument
|
|
parser.add_argument('--config', help="Path to the configuration file.", default='config.ini')
|
|
parser.add_argument('--pid_dir', help="PID files path.", default='.')
|
|
parser.add_argument('--py_exec', help="Path to the Python executable.", default=sys.executable)
|
|
args = parser.parse_args()
|
|
|
|
# PID file paths
|
|
db_pid_file = os.path.join(args.pid_dir, 'meshview-db.pid')
|
|
web_pid_file = os.path.join(args.pid_dir, 'meshview-web.pid')
|
|
|
|
# Track PID files globally for cleanup
|
|
pid_files.append(db_pid_file)
|
|
pid_files.append(web_pid_file)
|
|
|
|
# Database Thread
|
|
dbthrd = threading.Thread(
|
|
target=run_script, args=(args.py_exec, 'startdb.py', db_pid_file, '--config', args.config)
|
|
)
|
|
|
|
# Web server thread
|
|
webthrd = threading.Thread(
|
|
target=run_script, args=(args.py_exec, 'main.py', web_pid_file, '--config', args.config)
|
|
)
|
|
|
|
# Start Meshview subprocess threads
|
|
logger.info(f"Starting Meshview with config: {args.config}")
|
|
logger.info("Starting database thread...")
|
|
dbthrd.start()
|
|
logger.info("Starting web server thread...")
|
|
webthrd.start()
|
|
|
|
try:
|
|
dbthrd.join()
|
|
webthrd.join()
|
|
except KeyboardInterrupt:
|
|
# This shouldn't be reached due to signal handler, but just in case
|
|
signal_handler(signal.SIGINT, None)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|