Skip to content

Commit 4cb0ae4

Browse files
committed
specify exit code in _die
1 parent f493217 commit 4cb0ae4

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

workers/init.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
// UnityHTTPD::die() makes no output by default
2323
// builtin die() makes a return code of 0, we want nonzero
24-
function _die($msg)
24+
function _die(string $msg, int $exit_code)
2525
{
2626
print $msg;
27-
exit(1);
27+
exit($exit_code);
2828
}

workers/remove-users-from-group.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
include __DIR__ . "/init.php";
44

55
if (sizeof($argv) != 3 or in_array($argv, ["-h", "--help"])) {
6-
die("Usage: $argv[0] group_name filename_of_users_to_remove\n");
6+
_die("Usage: $argv[0] group_name filename_of_users_to_remove\n", 0);
77
}
88

99
$gid = $argv[1];
1010
$filename = $argv[2];
1111
$group = new UnityGroup($gid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
1212
if (!$group->exists()) {
13-
_die("No such group '$gid'\n");
13+
_die("No such group '$gid'\n", 1);
1414
}
15-
($handle = fopen($filename, "r")) or _die("Can't open '$filename'\n");
15+
($handle = fopen($filename, "r")) or _die("Can't open '$filename'\n", 1);
1616
while (($line = fgets($handle)) !== false) {
1717
$uid = trim($line);
1818
$user = new UnityUser($uid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);

workers/update-ldap-cache.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44

55
$options = getopt("fuh", ["help"]);
66
if (array_key_exists("h", $options) or array_key_exists("help", $options)) {
7-
echo "arguments:
7+
_die(
8+
"arguments:
89
f: flush cache and then update
910
u: update cache even if already initialized
10-
h --help: display this message\n";
11-
die();
11+
h --help: display this message\n",
12+
0,
13+
);
1214
}
1315
if (array_key_exists("f", $options)) {
1416
echo "flushing cache...\n";

0 commit comments

Comments
 (0)