Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93adb524 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "init: Fix logging stutter"

parents 6743dab5 636b1ebd
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -38,28 +38,29 @@ int watchdogd_main(int argc, char **argv) {
    int margin = 10;
    if (argc >= 3) margin = atoi(argv[2]);

    NOTICE("watchdogd started (interval %d, margin %d)!\n", interval, margin);
    NOTICE("started (interval %d, margin %d)!\n", interval, margin);

    int fd = open(DEV_NAME, O_RDWR|O_CLOEXEC);
    if (fd == -1) {
        ERROR("watchdogd: Failed to open %s: %s\n", DEV_NAME, strerror(errno));
        ERROR("Failed to open %s: %s\n", DEV_NAME, strerror(errno));
        return 1;
    }

    int timeout = interval + margin;
    int ret = ioctl(fd, WDIOC_SETTIMEOUT, &timeout);
    if (ret) {
        ERROR("watchdogd: Failed to set timeout to %d: %s\n", timeout, strerror(errno));
        ERROR("Failed to set timeout to %d: %s\n", timeout, strerror(errno));
        ret = ioctl(fd, WDIOC_GETTIMEOUT, &timeout);
        if (ret) {
            ERROR("watchdogd: Failed to get timeout: %s\n", strerror(errno));
            ERROR("Failed to get timeout: %s\n", strerror(errno));
        } else {
            if (timeout > margin) {
                interval = timeout - margin;
            } else {
                interval = 1;
            }
            ERROR("watchdogd: Adjusted interval to timeout returned by driver: timeout %d, interval %d, margin %d\n",
            WARNING("Adjusted interval to timeout returned by driver:"
                    " timeout %d, interval %d, margin %d\n",
                    timeout, interval, margin);
        }
    }