mirror of
https://github.com/C9Glax/tranga.git
synced 2025-02-22 15:20:12 +01:00
Merge branch 'cuttingedge-merge-ServerV2' into cuttingedge
This commit is contained in:
commit
b4edcccafe
@ -169,6 +169,8 @@ public static class TrangaSettings
|
|||||||
jobj.Add("requestLimits", JToken.FromObject(requestLimits));
|
jobj.Add("requestLimits", JToken.FromObject(requestLimits));
|
||||||
jobj.Add("bufferLibraryUpdates", JToken.FromObject(bufferLibraryUpdates));
|
jobj.Add("bufferLibraryUpdates", JToken.FromObject(bufferLibraryUpdates));
|
||||||
jobj.Add("bufferNotifications", JToken.FromObject(bufferNotifications));
|
jobj.Add("bufferNotifications", JToken.FromObject(bufferNotifications));
|
||||||
|
jobj.Add("chromiumStartTimeout", JToken.FromObject(ChromiumStartupTimeoutMs));
|
||||||
|
jobj.Add("chromiumPageTimeout", JToken.FromObject(ChromiumPageTimeoutMs));
|
||||||
return jobj;
|
return jobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -193,5 +195,9 @@ public static class TrangaSettings
|
|||||||
bufferLibraryUpdates = blu.Value<bool>()!;
|
bufferLibraryUpdates = blu.Value<bool>()!;
|
||||||
if (jobj.TryGetValue("bufferNotifications", out JToken? bn))
|
if (jobj.TryGetValue("bufferNotifications", out JToken? bn))
|
||||||
bufferNotifications = bn.Value<bool>()!;
|
bufferNotifications = bn.Value<bool>()!;
|
||||||
|
if (jobj.TryGetValue("chromiumStartTimeout", out JToken? cst))
|
||||||
|
ChromiumStartupTimeoutMs = cst.Value<int>();
|
||||||
|
if (jobj.TryGetValue("chromiumPageTimeout", out JToken? cpt))
|
||||||
|
ChromiumPageTimeoutMs = cpt.Value<int>();
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user