mirror of
https://github.com/Grasscutters/Cultivation.git
synced 2025-12-14 16:14:48 +01:00
Revert handle and add logging
Server.ts isn't actually printing the error to the user anyways so there was no point in trying to fix it
This commit is contained in:
@@ -130,7 +130,15 @@ pub fn read_file(path: String) -> String {
|
|||||||
|
|
||||||
let mut file = match fs::File::open(path_buf) {
|
let mut file = match fs::File::open(path_buf) {
|
||||||
Ok(file) => file,
|
Ok(file) => file,
|
||||||
Err(e) => return String.from::(""); // Send back error for handling by the caller
|
Err(e) => {
|
||||||
|
if path.contains("config") {
|
||||||
|
// Server.ts won't print the error so handle the message here for the user
|
||||||
|
println!("Server config not found or invalid. Be sure to run the server at least once to generate it before making edits.");
|
||||||
|
} else {
|
||||||
|
println!("Failed to open file: {}", e);
|
||||||
|
}
|
||||||
|
return String::new(); // Send back error for handling by the caller
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut contents = String::new();
|
let mut contents = String::new();
|
||||||
|
|||||||
@@ -40,11 +40,5 @@ export async function encryptionEnabled(path: string) {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Also check if null just in case
|
|
||||||
if (serverConf == null) {
|
|
||||||
console.log(`Server config at ${path} not found or invalid. Be sure to run the server at least once to generate it`)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return serverConf.server.http.encryption.useEncryption
|
return serverConf.server.http.encryption.useEncryption
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user