Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions devolutions-gateway/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ const ARG_SOGAR_USERNAME: &str = "sogar-username";
const ARG_SOGAR_PASSWORD: &str = "sogar-password";
const ARG_SOGAR_IMAGE_NAME: &str = "sogar-image-name";

const SERVICE_NAME: &str = "devolutions-gateway";
const DISPLAY_NAME: &str = "Devolutions Gateway";
const DESCRIPTION: &str = "Devolutions Gateway service";
const COMPANY_NAME: &str = "Devolutions";
pub const SERVICE_NAME: &str = "devolutions-gateway";
pub const DISPLAY_NAME: &str = "Devolutions Gateway";
pub const DESCRIPTION: &str = "Devolutions Gateway service";
pub const COMPANY_NAME: &str = "Devolutions";

cfg_if! {
if #[cfg(target_os = "windows")] {
Expand Down
93 changes: 73 additions & 20 deletions devolutions-gateway/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use ceviche::controller::{dispatch, Controller, *};
use ceviche::{Service, ServiceEvent};
use cfg_if::cfg_if;
use clap::{crate_name, crate_version, App, SubCommand};
use devolutions_gateway::config::Config;
use devolutions_gateway::service::GatewayService;

use ceviche::controller::{dispatch, Controller};
use ceviche::{Service, ServiceEvent};
use slog_scope::info;
use std::sync::mpsc;

Expand Down Expand Up @@ -41,28 +42,80 @@ Service!("gateway", gateway_service_main);

#[tokio::main]
async fn main() -> Result<(), String> {
let config = Config::init();
let args: Vec<String> = std::env::args().collect();
if (args.len() > 1) && (!args[1].starts_with("-")) {
let cli_app = App::new(crate_name!())
.author("Devolutions Inc.")
.version(concat!(crate_version!(), "\n"))
.version_short("v")
.about("Devolutions Gateway")
.subcommand(
SubCommand::with_name("service")
.subcommand(SubCommand::with_name("register"))
.subcommand(SubCommand::with_name("unregister")),
);

match cli_app.get_matches().subcommand() {
("service", Some(matches)) => {
let service_name = devolutions_gateway::config::SERVICE_NAME;
let display_name = devolutions_gateway::config::DISPLAY_NAME;
let description = devolutions_gateway::config::DESCRIPTION;
let mut controller = Controller::new(service_name, display_name, description);

cfg_if! { if #[cfg(target_os = "linux")] {
controller.config = Some(r#"
[Unit]
After=
After=network-online.target

[Service]
ExecStart=
ExecStart=/usr/bin/devolutions-gateway --service
Restart=on-failure

[Install]
WantedBy=
WantedBy=multi-user.target
"#.to_string());
}}

match matches.subcommand() {
("register", Some(_matches)) => {
controller.create().expect("failed to register service");
}
("unregister", Some(_matches)) => {
controller.delete().expect("failed to unregister service");
}
_ => panic!("invalid service subcommand"),
}
}
_ => panic!("invalid command"),
}
} else {
let config = Config::init();

if !config.service_mode {
let mut service = GatewayService::load().expect("error loading service");
if !config.service_mode {
let mut service = GatewayService::load().expect("error loading service");

service.start();
service.start();

// future waiting for some stop signals (CTRL-C…)
let _ = build_signals_fut().await?;
// future waiting for some stop signals (CTRL-C…)
let _ = build_signals_fut().await?;

service.stop();
} else {
let mut controller = Controller::new(
config.service_name.as_str(),
config.display_name.as_str(),
config.description.as_str(),
);

controller
.register(service_main_wrapper)
.map_err(|err| format!("failed to register service - {}", err))?;
service.stop();
} else {
let mut controller = Controller::new(
config.service_name.as_str(),
config.display_name.as_str(),
config.description.as_str(),
);

controller
.register(service_main_wrapper)
.map_err(|err| format!("failed to register service - {}", err))?;
}
}

Ok(())
}

Expand Down
246 changes: 0 additions & 246 deletions package/Linux/cron.daily/devolutions-gateway

This file was deleted.

2 changes: 1 addition & 1 deletion package/Linux/gateway/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Upstream-Name: devolutions-gateway
Source: https://wayk.devolutions.net

Files: *
Copyright: 2020 Devolutions Inc.
Copyright: 2020-2021 Devolutions Inc.
License: non-free
.
Loading