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

Commit ed9354fc authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Accept socket connection before tracing. 

Sometimes dumping threads takes a long time and bugreport times
out. This change will cause us to accept the bugreport socket connection
before dumping threads and should avoid the failed to connect to dumpstate
service problems we've seen.

Bug: 17758374
Change-Id: I80afa0353cf1c340873f481a8d1d7faffff54120
parent 5ee2c9d2

cmds/dumpstate/dumpstate.c

+7 −3
Original line number Diff line number Diff line
@@ -438,6 +438,12 @@ int main(int argc, char *argv[]) { 
        }

    }



    // If we are going to use a socket, do it as early as possible

    // to avoid timeouts from bugreport.

    if (use_socket) {

        redirect_to_socket(stdout, "dumpstate");

    }



    /* open the vibrator before dropping root */

    FILE *vibrator = 0;

    if (do_vibrate) {
@@ -504,9 +510,7 @@ int main(int argc, char *argv[]) { 
    char path[PATH_MAX], tmp_path[PATH_MAX];

    pid_t gzip_pid = -1;



    if (use_socket) {

        redirect_to_socket(stdout, "dumpstate");

    } else if (use_outfile) {

    if (!use_socket && use_outfile) {

        strlcpy(path, use_outfile, sizeof(path));

        if (do_add_date) {

            char date[80];