From 0ca3c5c1038945877fad25916a3e32395b9aeaa9 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Fri, 14 Aug 2020 17:50:54 -0400
Subject: Reset restartInterval and restartDeadline on start

---
 service.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/service.c b/service.c
index 3472151..ef4834a 100644
--- a/service.c
+++ b/service.c
@@ -22,7 +22,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 #include <syslog.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "daemon.h"
@@ -107,14 +109,24 @@ err:
 
 void serviceStart(struct Service *service) {
 	if (service->state == Start) return;
-	service->intent = Start;
-	// TODO: Reset restart interval.
 
+	if (service->intent == Start) {
+		struct timespec backoff = service->restartInterval;
+		timespecadd(&backoff, &backoff, &service->restartInterval);
+	} else {
+		service->restartInterval = restartInterval;
+	}
+	clock_gettime(CLOCK_MONOTONIC_FAST, &service->restartDeadline);
+	timespecadd(
+		&service->restartDeadline, &service->restartInterval,
+		&service->restartDeadline
+	);
+
+	service->intent = Start;
 	service->pid = fork();
 	if (service->pid < 0) {
 		syslog(LOG_ERR, "fork: %m");
 		return;
-		// FIXME: Do we treat this as a restart condition?
 	}
 	if (service->pid) {
 		service->state = Start;
-- 
cgit 1.4.1

15130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>commit</a> <a href='/src/diff/www/photo.causal.agency/2024-07-27/film?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/www/photo.causal.agency/2024-07-27/film'>
<input type='hidden' name='id' value='1215130a85ee9abe70d2e2c8af4eb0be368f4294'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>root</a>/<a href='/src/log/www?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>www</a>/<a href='/src/log/www/photo.causal.agency?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>photo.causal.agency</a>/<a href='/src/log/www/photo.causal.agency/2024-07-27?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>2024-07-27</a>/<a href='/src/log/www/photo.causal.agency/2024-07-27/film?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>film</a> (<a href='/src/log/www/photo.causal.agency/2024-07-27/film?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/www/photo.causal.agency/2024-07-27/film?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-09-25 10:05:37 -0400'>2024-09-25</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-15/lens?id=1a4a0628513359733a2450cf38e73166f7e5cbe6&amp;follow=1'>Add photos from September 15</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 18:06:38 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-14/lens?id=16992208ec0549fdbc776da35c9f799126d15d89&amp;follow=1'>Add photos from September 14</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 10:13:27 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-12/lens?id=de6decda3177ae64859be30d68ba1e3c4c132ec1&amp;follow=1'>Add photos from September 12</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:50:19 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-07/lens?id=49a105101493f4dd51259dd62dcbd24df0909bd3&amp;follow=1'>Add photos from September 7</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:48:24 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=55728948b94a17b99fabeb1c61d20c5ef18c7f73&amp;follow=1'>Allow not having descriptions</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-23 17:44:15 -0400'>2024-09-23</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=9a38d0932d64b4a2ed5a6a2499490094d3bf8e7e&amp;follow=1'>Automatically select the last used lens for a body</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-19 23:20:42 -0400'>2024-09-19</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-05/lens?id=894873c86c5397a92499de39b4c52b5e99801441&amp;follow=1'>Add photos from September 5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-15 16:02:27 -0400'>2024-09-15</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=32b69f7df4c155d7a09f140a53c3b39a330027e4&amp;follow=1'>Add some more film stocks to the list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 20:06:35 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-02/lens?id=45e859f37e503f2c85a3085a628226831e394b7b&amp;follow=1'>Add photos from September 2</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 12:54:24 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=57e90a2d8f5f9b6385ffeb0e0e7b3237cb395b80&amp;follow=1'>Add Fomapan 200 to films list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-10 20:30:28 -0400'>2024-09-10</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-29/lens?id=1134af7da7776a0631995094a9225ce3541a9518&amp;follow=1'>Add August 29 picnic photos</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:44:08 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=775260288133dc90bb600785772ac931854aa618&amp;follow=1'>Apply some bold to trips rendering</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:38:22 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=dd7fda85bcc69cd4cd35e006cffabf3bdf765104&amp;follow=1'>Render trips hopefully more efficiently</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:26:18 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=02cac2ffadee1d3f66426bb48a64aea78907878c&amp;follow=1'>Allow removing bodies and lenses</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 10:59:25 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=2c25b7204ecab1be0d128d984eabe35b10a3a418&amp;follow=1'>Limit body width so it looks less silly on desktop</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 21:02:03 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=74df90da35ed7886c4067fae700c9db1d3b2ef0a&amp;follow=1'>Handle no film being loaded</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 20:58:45 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=a7f8aa5246afbf9c01ca295bdd2af0e11faeb7d3&amp;follow=1'>Fancy up the text a little</a></td><td>June McEnroe