Merge pull request 'fix(sidecar): apply rustfmt to the protocol 3.0 cutover code' (#22) from fix/rustfmt-release into main
Reviewed-on: #22 Reviewed-by: Colby Whitlock <whitlocktech@gmail.com>
This commit is contained in:
@@ -262,11 +262,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
// lets a reader tell a re-send from an actual config change.
|
// lets a reader tell a re-send from an actual config change.
|
||||||
"world.ruleset" => {
|
"world.ruleset" => {
|
||||||
if let Err(e) = event_store
|
if let Err(e) = event_store
|
||||||
.upsert_ruleset(
|
.upsert_ruleset(ev.value.get("rev").and_then(|r| r.as_str()), &text, t)
|
||||||
ev.value.get("rev").and_then(|r| r.as_str()),
|
|
||||||
&text,
|
|
||||||
t,
|
|
||||||
)
|
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
tracing::warn!(error = %e, "failed to upsert ruleset");
|
tracing::warn!(error = %e, "failed to upsert ruleset");
|
||||||
|
|||||||
@@ -299,7 +299,12 @@ impl Store {
|
|||||||
/// `world.ruleset` frame per connect describing how it is configured, and only the latest one
|
/// `world.ruleset` frame per connect describing how it is configured, and only the latest one
|
||||||
/// matters. `rev` is the shard's FNV-1a of the body, kept so a reader can tell "same ruleset,
|
/// matters. `rev` is the shard's FNV-1a of the body, kept so a reader can tell "same ruleset,
|
||||||
/// re-sent on reconnect" from "the operator changed something" without diffing the JSON.
|
/// re-sent on reconnect" from "the operator changed something" without diffing the JSON.
|
||||||
pub async fn upsert_ruleset(&self, rev: Option<&str>, json: &str, t: i64) -> anyhow::Result<()> {
|
pub async fn upsert_ruleset(
|
||||||
|
&self,
|
||||||
|
rev: Option<&str>,
|
||||||
|
json: &str,
|
||||||
|
t: i64,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO ruleset (id, rev, json, updated_t) VALUES (1, ?, ?, ?)
|
"INSERT INTO ruleset (id, rev, json, updated_t) VALUES (1, ?, ?, ?)
|
||||||
ON CONFLICT(id) DO UPDATE SET rev = excluded.rev, json = excluded.json, updated_t = excluded.updated_t",
|
ON CONFLICT(id) DO UPDATE SET rev = excluded.rev, json = excluded.json, updated_t = excluded.updated_t",
|
||||||
|
|||||||
Reference in New Issue
Block a user