fix
This commit is contained in:
parent
60f0e3dbc1
commit
0d972b0b75
@ -12,6 +12,7 @@
|
|||||||
### Changes from v2.0.4-rc
|
### Changes from v2.0.4-rc
|
||||||
|
|
||||||
* Continue documentation updates
|
* Continue documentation updates
|
||||||
|
* Prevent overlapping `repertory` `ApiPort`'s
|
||||||
* Removed passwords and secret key values from API calls
|
* Removed passwords and secret key values from API calls
|
||||||
* Renamed setting `ApiAuth` to `ApiPassword`
|
* Renamed setting `ApiAuth` to `ApiPassword`
|
||||||
* Require `--name,-na` option for encryption provider
|
* Require `--name,-na` option for encryption provider
|
||||||
|
@ -55,10 +55,8 @@ namespace repertory::cli::actions {
|
|||||||
mount(std::vector<const char *> args, std::string data_directory,
|
mount(std::vector<const char *> args, std::string data_directory,
|
||||||
int &mount_result, provider_type prov, const std::string &remote_host,
|
int &mount_result, provider_type prov, const std::string &remote_host,
|
||||||
std::uint16_t remote_port, const std::string &unique_id) -> exit_code {
|
std::uint16_t remote_port, const std::string &unique_id) -> exit_code {
|
||||||
auto ret = exit_code::success;
|
|
||||||
|
|
||||||
lock_data lock(prov, unique_id);
|
lock_data lock(prov, unique_id);
|
||||||
const auto res = lock.grab_lock();
|
auto res = lock.grab_lock();
|
||||||
if (res == lock_result::locked) {
|
if (res == lock_result::locked) {
|
||||||
std::cerr << app_config::get_provider_display_name(prov)
|
std::cerr << app_config::get_provider_display_name(prov)
|
||||||
<< " mount is already active" << std::endl;
|
<< " mount is already active" << std::endl;
|
||||||
@ -66,7 +64,7 @@ mount(std::vector<const char *> args, std::string data_directory,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (res != lock_result::success) {
|
if (res != lock_result::success) {
|
||||||
ret = exit_code::lock_failed;
|
return exit_code::lock_failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
|
@ -510,6 +510,8 @@ void handlers::handle_post_mount(const httplib::Request &req,
|
|||||||
|
|
||||||
launch_process(prov, name, {location}, true);
|
launch_process(prov, name, {location}, true);
|
||||||
config_->set_mount_location(prov, name, location);
|
config_->set_mount_location(prov, name, location);
|
||||||
|
|
||||||
|
launch_process(prov, name, {"-status"});
|
||||||
}
|
}
|
||||||
|
|
||||||
res.status = http_error_codes::ok;
|
res.status = http_error_codes::ok;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user