Overview
| Comment: | added lock, detailed errors |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
39ee25f5c3ea9bd2a772ebd2e12f3110 |
| User & Date: | arcade on 2020-11-29 19:48:38.693 |
| Other Links: | manifest | tags |
Context
|
2020-11-30
| ||
| 19:49 | 0.1.11: optimize out one table, fix /add and /update, add /delete check-in: f322efafd9 user: arcade tags: trunk | |
|
2020-11-29
| ||
| 19:48 | added lock, detailed errors check-in: 39ee25f5c3 user: arcade tags: trunk | |
|
2020-11-27
| ||
| 19:29 | 0.1.9: add ownership checks, rewrite error handling check-in: ebe7c281a5 user: arcade tags: trunk | |
Changes
Added Cargo.lock version [3e772cfc3c].
Modified Cargo.toml
from [d15c4051b4]
to [11f9855924].
1 2 | [package] name = "rsstg" | | | 1 2 3 4 5 6 7 8 9 10 | [package] name = "rsstg" version = "0.1.10" authors = ["arcade"] edition = "2018" [dependencies] chrono = "*" config = "*" futures = "*" |
| ︙ | ︙ |
Modified src/main.rs
from [7b25067601]
to [ee7367a2d2].
| ︙ | ︙ | |||
48 49 50 51 52 53 54 |
.connect_timeout(std::time::Duration::new(300, 0))
.idle_timeout(std::time::Duration::new(60, 0))
.connect_lazy(&settings.get_str("pg")?)?,
};
let clone = core.clone();
tokio::spawn(async move {
if let Err(err) = &clone.autofetch().await {
| | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 |
.connect_timeout(std::time::Duration::new(300, 0))
.idle_timeout(std::time::Duration::new(60, 0))
.connect_lazy(&settings.get_str("pg")?)?,
};
let clone = core.clone();
tokio::spawn(async move {
if let Err(err) = &clone.autofetch().await {
if let Err(err) = clone.debug(&format!("{:?}", err)) {
eprintln!("Autofetch error: {}", err);
};
}
});
Ok(core)
}
|
| ︙ | ︙ | |||
158 159 160 161 162 163 164 |
let id: i64 = id.into();
let mut conn = self.pool.acquire().await
.with_context(|| format!("🛑 Enable fetch conn:\n{:?}", &self.pool))?;
match sqlx::query("update rsstg_source set enabled = true where source_id = $1 and owner = $2")
.bind(source_id)
.bind(id)
.execute(&mut conn).await
| | | | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
let id: i64 = id.into();
let mut conn = self.pool.acquire().await
.with_context(|| format!("🛑 Enable fetch conn:\n{:?}", &self.pool))?;
match sqlx::query("update rsstg_source set enabled = true where source_id = $1 and owner = $2")
.bind(source_id)
.bind(id)
.execute(&mut conn).await
.with_context(|| format!("🛑 Enable source:\n{:?}", &self.pool))?
.rows_affected() {
1 => { Ok("Source disabled\\.") },
0 => { Ok("Source not found\\.") },
_ => { Err(anyhow!("Database error.")) },
}
}
async fn disable<S>(&self, source_id: &i32, id: S) -> Result<&str>
where S: Into<i64> {
let id: i64 = id.into();
let mut conn = self.pool.acquire().await
.with_context(|| format!("🛑 Disable fetch conn:\n{:?}", &self.pool))?;
match sqlx::query("update rsstg_source set enabled = false where source_id = $1 and owner = $2")
.bind(source_id)
.bind(id)
.execute(&mut conn).await
.with_context(|| format!("🛑 Disable source:\n{:?}", &self.pool))?
.rows_affected() {
1 => { Ok("Source disabled\\.") },
0 => { Ok("Source not found\\.") },
_ => { Err(anyhow!("Database error.")) },
}
}
|
| ︙ | ︙ | |||
204 205 206 207 208 209 210 |
sqlx::query("update rsstg_source set last_scrape = now() + interval '1 hour' where source_id = $1;")
.bind(source_id)
.execute(&mut conn).await
.with_context(|| format!("🛑 Lock source:\n\n{:?}", &self.pool))?;
let clone = self.clone();
tokio::spawn(async move {
if let Err(err) = clone.check(&source_id, owner, true).await {
| | | 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 |
sqlx::query("update rsstg_source set last_scrape = now() + interval '1 hour' where source_id = $1;")
.bind(source_id)
.execute(&mut conn).await
.with_context(|| format!("🛑 Lock source:\n\n{:?}", &self.pool))?;
let clone = self.clone();
tokio::spawn(async move {
if let Err(err) = clone.check(&source_id, owner, true).await {
if let Err(err) = clone.debug(&format!("{:?}", err)) {
eprintln!("Check error: {}", err);
};
};
});
} else {
if next_fetch - now < delay {
delay = next_fetch - now;
|
| ︙ | ︙ | |||
260 261 262 263 264 265 266 |
let core = Core::new(settings).await?;
let mut stream = core.stream();
while let Some(update) = stream.next().await {
if let Err(err) = handle(update?, &core).await {
| | | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 |
let core = Core::new(settings).await?;
let mut stream = core.stream();
while let Some(update) = stream.next().await {
if let Err(err) = handle(update?, &core).await {
core.debug(&format!("{:?}", err))?;
};
}
Ok(())
}
async fn handle(update: telegram_bot::Update, core: &Core) -> Result<()> {
|
| ︙ | ︙ |