commit 3beafe2317a0a7b445f12f0b780a3a9357e416cf · nekomimi.pet/microcosm-rs

+10 -4

slingshot/src/main.rs

···

       31
        
           /// disk cache size in GB

     

       32
        
           #[arg(long, default_value_t = 1)]

     

       33
        
           cache_disk_gb: usize,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
           /// the domain pointing to this server

     

       35
        
           ///

     

       36
        
           /// if present:

     
···

       68
        
       

     

       69
        
           let args = Args::parse();

     

       70
        
       

     

       71
       -
           if let Err(e) = install_metrics_server() {

     

       72
        
               log::error!("failed to install metrics server: {e:?}");

     

       73
        
           } else {

     

       74
       -
               log::info!("metrics listening at http://0.0.0.0:8765");

     

       75
        
           }

     

       76
        
       

     

       77
        
           std::fs::create_dir_all(&args.cache_dir).map_err(|e| {

     
···

       123
        
                   args.domain,

     

       124
        
                   args.acme_contact,

     

       125
        
                   args.certs,

     

       0
        
       
     

       126
        
                   server_shutdown,

     

       127
        
               )

     

       128
        
               .await?;

     
···

       183
        
           Ok(())

     

       184
        
       }

     

       185
        
       

     

       186
       -
       fn install_metrics_server() -> Result<(), metrics_exporter_prometheus::BuildError> {

     

       187
        
           log::info!("installing metrics server...");

     

       188
        
           let host = [0, 0, 0, 0];

     

       189
       -
           let port = 8765;

     

       190
        
           PrometheusBuilder::new()

     

       191
        
               .set_quantiles(&[0.5, 0.9, 0.99, 1.0])?

     

       192
        
               .set_bucket_duration(std::time::Duration::from_secs(300))?

···

       31
        
           /// disk cache size in GB

     

       32
        
           #[arg(long, default_value_t = 1)]

     

       33
        
           cache_disk_gb: usize,

     

       34
       +
           /// port for HTTP server (when not using --domain)

     

       35
       +
           #[arg(long, default_value_t = 3000)]

     

       36
       +
           port: u16,

     

       37
       +
           /// port for metrics/prometheus server

     

       38
       +
           #[arg(long, default_value_t = 8765)]

     

       39
       +
           metrics_port: u16,

     

       40
        
           /// the domain pointing to this server

     

       41
        
           ///

     

       42
        
           /// if present:

     
···

       74
        
       

     

       75
        
           let args = Args::parse();

     

       76
        
       

     

       77
       +
           if let Err(e) = install_metrics_server(args.metrics_port) {

     

       78
        
               log::error!("failed to install metrics server: {e:?}");

     

       79
        
           } else {

     

       80
       +
               log::info!("metrics listening at http://0.0.0.0:{}", args.metrics_port);

     

       81
        
           }

     

       82
        
       

     

       83
        
           std::fs::create_dir_all(&args.cache_dir).map_err(|e| {

     
···

       129
        
                   args.domain,

     

       130
        
                   args.acme_contact,

     

       131
        
                   args.certs,

     

       132
       +
                   args.port,

     

       133
        
                   server_shutdown,

     

       134
        
               )

     

       135
        
               .await?;

     
···

       190
        
           Ok(())

     

       191
        
       }

     

       192
        
       

     

       193
       +
       fn install_metrics_server(port: u16) -> Result<(), metrics_exporter_prometheus::BuildError> {

     

       194
        
           log::info!("installing metrics server...");

     

       195
        
           let host = [0, 0, 0, 0];

     

       0
        
       
     

       196
        
           PrometheusBuilder::new()

     

       197
        
               .set_quantiles(&[0.5, 0.9, 0.99, 1.0])?

     

       198
        
               .set_bucket_duration(std::time::Duration::from_secs(300))?

+7 -1

slingshot/src/server.rs

···

       694
        
           domain: Option<String>,

     

       695
        
           acme_contact: Option<String>,

     

       696
        
           certs: Option<PathBuf>,

     

       0
        
       
     

       697
        
           shutdown: CancellationToken,

     

       698
        
       ) -> Result<(), ServerError> {

     

       699
        
           let repo = Arc::new(repo);

     
···

       752
        
               )

     

       753
        
               .await

     

       754
        
           } else {

     

       755
       -
               run(TcpListener::bind("127.0.0.1:3000"), app, shutdown).await

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       756
        
           }

     

       757
        
       }

     

       758

···

       694
        
           domain: Option<String>,

     

       695
        
           acme_contact: Option<String>,

     

       696
        
           certs: Option<PathBuf>,

     

       697
       +
           port: u16,

     

       698
        
           shutdown: CancellationToken,

     

       699
        
       ) -> Result<(), ServerError> {

     

       700
        
           let repo = Arc::new(repo);

     
···

       753
        
               )

     

       754
        
               .await

     

       755
        
           } else {

     

       756
       +
               run(

     

       757
       +
                   TcpListener::bind(format!("127.0.0.1:{port}")),

     

       758
       +
                   app,

     

       759
       +
                   shutdown,

     

       760
       +
               )

     

       761
       +
               .await

     

       762
        
           }

     

       763
        
       }

     

       764