Refactor supervisor to use environment variables and simplify binary
- Created scripts/generate_secret.sh to generate supervisor secrets - Added .env.example with all configuration options - Created scripts/environment.sh to load env vars from .env - Updated scripts/run.sh to use env vars and pass as flags - Simplified supervisor binary: - Removed bootstrap-admin-key and config file support - Made admin-secret required - Minimal output (only URLs) - Clean startup with no verbose logging - Updated .gitignore for .env and log files
This commit is contained in:
Timur Gordon
@@ -1,38 +1,24 @@
|
||||
//! # Hero Supervisor Binary
|
||||
//!
|
||||
//! Main supervisor binary that manages multiple actors and listens to jobs over Redis.
|
||||
//! The supervisor builds with actor configuration, starts actors, and dispatches jobs
|
||||
//! to the appropriate runners based on the job's runner field.
|
||||
|
||||
|
||||
//! Hero Supervisor Binary
|
||||
|
||||
use hero_supervisor::{SupervisorApp, SupervisorBuilder};
|
||||
use clap::Parser;
|
||||
use log::{info, error};
|
||||
use std::path::PathBuf;
|
||||
use log::error;
|
||||
|
||||
|
||||
|
||||
|
||||
/// Command line arguments for the supervisor
|
||||
/// Hero Supervisor - manages actors and dispatches jobs
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(name = "supervisor")]
|
||||
#[command(about = "Hero Supervisor - manages multiple actors and dispatches jobs")]
|
||||
#[command(about = "Hero Supervisor - manages actors and dispatches jobs")]
|
||||
struct Args {
|
||||
/// Path to the configuration TOML file
|
||||
#[arg(short, long, value_name = "FILE")]
|
||||
config: Option<PathBuf>,
|
||||
|
||||
/// Redis URL for job queue
|
||||
#[arg(long, default_value = "redis://localhost:6379")]
|
||||
#[arg(long, default_value = "redis://127.0.0.1:6379")]
|
||||
redis_url: String,
|
||||
|
||||
/// Namespace for Redis keys
|
||||
#[arg(long, default_value = "")]
|
||||
namespace: String,
|
||||
|
||||
/// Admin secrets (can be specified multiple times)
|
||||
#[arg(long = "admin-secret", value_name = "SECRET")]
|
||||
/// Admin secrets (required, can be specified multiple times)
|
||||
#[arg(long = "admin-secret", value_name = "SECRET", required = true)]
|
||||
admin_secrets: Vec<String>,
|
||||
|
||||
/// User secrets (can be specified multiple times)
|
||||
@@ -43,14 +29,6 @@ struct Args {
|
||||
#[arg(long = "register-secret", value_name = "SECRET")]
|
||||
register_secrets: Vec<String>,
|
||||
|
||||
/// Mycelium daemon URL
|
||||
#[arg(long, default_value = "http://127.0.0.1:8990")]
|
||||
mycelium_url: String,
|
||||
|
||||
/// Mycelium topic for supervisor RPC messages
|
||||
#[arg(long, default_value = "supervisor.rpc")]
|
||||
topic: String,
|
||||
|
||||
/// Port for OpenRPC HTTP server
|
||||
#[arg(long, default_value = "3030")]
|
||||
port: u16,
|
||||
@@ -59,88 +37,37 @@ struct Args {
|
||||
#[arg(long, default_value = "127.0.0.1")]
|
||||
bind_address: String,
|
||||
|
||||
/// Bootstrap an initial admin API key with the given name
|
||||
#[arg(long = "bootstrap-admin-key", value_name = "NAME")]
|
||||
bootstrap_admin_key: Option<String>,
|
||||
/// Mycelium daemon URL (optional)
|
||||
#[arg(long, default_value = "")]
|
||||
mycelium_url: String,
|
||||
|
||||
/// Mycelium topic for supervisor RPC messages
|
||||
#[arg(long, default_value = "supervisor.rpc")]
|
||||
topic: String,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
// Initialize logging
|
||||
env_logger::init();
|
||||
|
||||
info!("Starting Hero Supervisor");
|
||||
|
||||
// Parse command line arguments
|
||||
let args = Args::parse();
|
||||
|
||||
|
||||
|
||||
// Create and initialize supervisor using builder pattern
|
||||
// Build supervisor
|
||||
let mut builder = SupervisorBuilder::new()
|
||||
.redis_url(&args.redis_url)
|
||||
.namespace(&args.namespace);
|
||||
|
||||
// Add secrets from CLI arguments
|
||||
if !args.admin_secrets.is_empty() {
|
||||
info!("Adding {} admin secret(s)", args.admin_secrets.len());
|
||||
builder = builder.admin_secrets(args.admin_secrets);
|
||||
}
|
||||
.namespace(&args.namespace)
|
||||
.admin_secrets(args.admin_secrets);
|
||||
|
||||
if !args.user_secrets.is_empty() {
|
||||
info!("Adding {} user secret(s)", args.user_secrets.len());
|
||||
builder = builder.user_secrets(args.user_secrets);
|
||||
}
|
||||
|
||||
if !args.register_secrets.is_empty() {
|
||||
info!("Adding {} register secret(s)", args.register_secrets.len());
|
||||
builder = builder.register_secrets(args.register_secrets);
|
||||
}
|
||||
|
||||
let supervisor = match args.config {
|
||||
Some(_config_path) => {
|
||||
info!("Loading configuration from config file not yet implemented");
|
||||
// For now, use CLI configuration
|
||||
builder.build().await?
|
||||
}
|
||||
None => {
|
||||
info!("Using CLI configuration");
|
||||
builder.build().await?
|
||||
}
|
||||
};
|
||||
let supervisor = builder.build().await?;
|
||||
|
||||
// Bootstrap admin key if requested
|
||||
if let Some(admin_key_name) = args.bootstrap_admin_key {
|
||||
info!("Bootstrapping admin API key: {}", admin_key_name);
|
||||
let admin_key = supervisor.bootstrap_admin_key(admin_key_name).await;
|
||||
println!("\n╔════════════════════════════════════════════════════════════╗");
|
||||
println!("║ 🔑 Admin API Key Created ║");
|
||||
println!("╚════════════════════════════════════════════════════════════╝");
|
||||
println!(" Name: {}", admin_key.name);
|
||||
println!(" Key: {}", admin_key.key);
|
||||
println!(" Scope: {}", admin_key.scope.as_str());
|
||||
println!(" ⚠️ SAVE THIS KEY - IT WILL NOT BE SHOWN AGAIN!");
|
||||
println!("╚════════════════════════════════════════════════════════════╝\n");
|
||||
}
|
||||
|
||||
// Print startup information
|
||||
let server_url = format!("http://{}:{}", args.bind_address, args.port);
|
||||
println!("\n╔════════════════════════════════════════════════════════════╗");
|
||||
println!("║ Hero Supervisor Started ║");
|
||||
println!("╚════════════════════════════════════════════════════════════╝");
|
||||
println!(" 📡 OpenRPC Server: {}", server_url);
|
||||
println!(" 🔗 Redis: {}", args.redis_url);
|
||||
#[cfg(feature = "mycelium")]
|
||||
if !args.mycelium_url.is_empty() {
|
||||
println!(" 🌐 Mycelium: {}", args.mycelium_url);
|
||||
} else {
|
||||
println!(" 🌐 Mycelium: Disabled");
|
||||
}
|
||||
#[cfg(not(feature = "mycelium"))]
|
||||
println!(" 🌐 Mycelium: Not compiled (use --features mycelium)");
|
||||
println!("╚════════════════════════════════════════════════════════════╝\n");
|
||||
|
||||
// Start OpenRPC server in background
|
||||
// Start OpenRPC server
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::Mutex;
|
||||
use hero_supervisor::openrpc::start_http_openrpc_server;
|
||||
@@ -150,11 +77,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let port = args.port;
|
||||
|
||||
tokio::spawn(async move {
|
||||
info!("Starting OpenRPC server on {}:{}", bind_addr, port);
|
||||
match start_http_openrpc_server(supervisor_arc, &bind_addr, port).await {
|
||||
Ok(handle) => {
|
||||
info!("OpenRPC server started successfully");
|
||||
// Keep the server running by holding the handle
|
||||
handle.stopped().await;
|
||||
error!("OpenRPC server stopped unexpectedly");
|
||||
}
|
||||
@@ -164,12 +88,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
}
|
||||
});
|
||||
|
||||
// Give the server a moment to start
|
||||
tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
|
||||
|
||||
let mut app = SupervisorApp::new(supervisor, args.mycelium_url, args.topic);
|
||||
// Print minimal startup info
|
||||
println!("📡 http://{}:{}", args.bind_address, args.port);
|
||||
#[cfg(feature = "mycelium")]
|
||||
if !args.mycelium_url.is_empty() {
|
||||
println!("🌐 {}", args.mycelium_url);
|
||||
}
|
||||
|
||||
// Start the complete supervisor application
|
||||
let mut app = SupervisorApp::new(supervisor, args.mycelium_url, args.topic);
|
||||
app.start().await?;
|
||||
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user