Skip to content

Commit 7d6a968

Browse files
committed
cron: support multiple CHILD_TAGs for TERMINATE_CHILDREN
The `tag` field is really a list of strings separated by null bytes.
1 parent a889090 commit 7d6a968

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

debian/changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cm4all-workshop (7.2) unstable; urgency=low
22

33
* workshop: disable plan UID check for "translate" plans
4+
* cron: support multiple CHILD_TAGs for TERMINATE_CHILDREN
45

56
--
67

src/cron/Workplace.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "co/Task.hxx"
2525
#include "util/DeleteDisposer.hxx"
2626
#include "util/StringCompare.hxx"
27+
#include "util/StringList.hxx"
2728
#include "EmailService.hxx"
2829
#include "debug.h"
2930

@@ -66,7 +67,7 @@ class CronWorkplace::Running final
6667
}
6768

6869
bool IsTag(std::string_view _tag) const noexcept {
69-
return tag == _tag;
70+
return StringListContains(tag, '\0', _tag);
7071
}
7172

7273
void Start(SocketAddress translation_socket,

0 commit comments

Comments
 (0)