hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move partition info into root endpoint

Browse source
This commit is contained in:
Lucien Greathouse 2018-05-30 22:44:06 -07:00
parent 8df0565e0e
commit 0d25e1c196
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/src/web.rs
View file

@ -25,6 +25,7 @@ struct ServerInfoResponse<'a> {
server_version: &'static str,
protocol_version: u64,
server_id: &'a str,
partitions: &'a HashMap<String, &'a [String]>,
}
#[derive(Debug, Serialize)]
@ -32,7 +33,6 @@ struct ServerInfoResponse<'a> {
struct ReadAllResponse<'a> {
server_id: &'a str,
instances: &'a HashMap<Id, RbxInstance>,
partitions: &'a HashMap<String, &'a [String]>,
message_cursor: i32,
}
@ -57,10 +57,17 @@ pub fn start(config: WebConfig) {
(GET) (/) => {
// Get a summary of information about the server.
let mut partitions = HashMap::new();
for partition in config.partitions.values() {
partitions.insert(partition.name.clone(), partition.target.as_slice());
}
json_response(ServerInfoResponse {
server_version,
protocol_version: 2,
server_id: &server_id,
partitions: &partitions,
})
},
@ -124,16 +131,9 @@ pub fn start(config: WebConfig) {
messages.len() as i32 - 1
};
let mut partitions = HashMap::new();
for partition in config.partitions.values() {
partitions.insert(partition.name.clone(), partition.target.as_slice());
}
json_response(ReadAllResponse {
server_id: &server_id,
message_cursor,
partitions: &partitions,
instances: &rbx_session.instances,
})
},