Merge branch 'refs/heads/t/short-log'

A few patches which change dss_log() to only print the time stamp
and the function if dss is executing the "run" subcommand.

Cooking for a week.

* refs/heads/t/short-log:
  Subcommand sensitive logging.
  Save the subcommand pointer in a global variable.
  main(): Don't initialize user data pointer.

diff --combined NEWS
index 1dfffd0f79ea54502f90c391a8d6bdac30a7d269,755cad21834cc7b6d150746e6555544d706802c6..fc80e8e6535045fc321b2e9be932b8f224177337
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -7,13 -7,10 +7,13 @@@ x.y.z (to be announced
   - The --no-resume option has been removed.
  
   - The gengetopt option parser has been replaced by the
 - [lopsub](http://people.tuebingen.mpg.de/~maan/lopsub) library. Hence
 + [lopsub](http://people.tuebingen.mpg.de/maan/lopsub) library. Hence
   lopsub must be installed to compile this package. Also help2man is
   no longer required since lopsub has built-in roff support.
  
 + - New subcommand "configtest" to check the command line options and
 + the configuration file for syntactic correctness.
 +
   - "make install" will install the executable and the man page.
  
   - In run mode, dss no longer exits successfully if another instance
@@@ -24,8 -21,6 +24,11 @@@
   - CFLAGS, CPPFLAGS and LDFLAGS can now be used to override the flags
   of the build system.
  
++ - For all subcommands other than "run", timestamps and function names
++ are omitted from the log output.
++
 + - The dss logo is now created with ImageMagick rather than dia.
 +
  ------------------
  0.1.7 (2017-04-17)
  ------------------

diff --combined dss.c
index 22a350a478bb9d48c67dca9487e15145bb11c8fe,c6c48f51889fc1c5c7e7a1e44c550a262886f8a7..6353fbe79df9b7b38f92d6e6c6fba1fa80399f5b
--- 1/dss.c
--- 2/dss.c
+++ b/dss.c
@@@ -63,6 -63,8 +63,8 @@@ static struct lls_parse_result *cmdline
  
  /** Parsed subcommand options. */
  static struct lls_parse_result *cmdline_sublpr, *sublpr;
+ /* The executing subcommand (NULL at startup). */
+ static const struct lls_command *subcmd;
  /** Wether daemon_init() was called. */
  static bool daemonized;
  /** Non-NULL if we log to a file. */
@@@ -242,16 -244,19 +244,19 @@@ __printf_1_2 void dss_log(const char* f
        if (loglevel < lpr_ll)
                return;
        outfd = logfile? logfile : stderr;
-       time(&t1);
-       tm = localtime(&t1);
-       strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
-       fprintf(outfd, "%s ", str);
-       if (lpr_ll <= INFO)
-               fprintf(outfd, "%i: ", loglevel);
+       if (subcmd == CMD_PTR(RUN)) {
+               time(&t1);
+               tm = localtime(&t1);
+               strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
+               fprintf(outfd, "%s ", str);
+               if (lpr_ll <= INFO)
+                       fprintf(outfd, "%i: ", loglevel);
+       }
+       if (subcmd == CMD_PTR(RUN))
  #ifdef DSS_NO_FUNC_NAMES
-       fprintf(outfd, "%s:%d: ", location_file, location_line);
+               fprintf(outfd, "%s:%d: ", location_file, location_line);
  #else
-       fprintf(outfd, "%s: ", location_func);
+               fprintf(outfd, "%s: ", location_func);
  #endif
        va_start(argp, fmt);
        vfprintf(outfd, fmt, argp);
@@@ -295,7 -300,6 +300,7 @@@ static int send_signal(int sig
                dss_msg("%d\n", (int)pid);
                return 0;
        }
 +      DSS_NOTICE_LOG(("sending signal %d to pid %d\n", sig, (int)pid));
        ret = kill(pid, sig);
        if (ret < 0)
                return -ERRNO_TO_DSS_ERROR(errno);
@@@ -516,7 -520,7 +521,7 @@@ static struct snapshot *find_orphaned_s
        struct snapshot *s;
        int i;
  
 -      DSS_DEBUG_LOG(("looking for orphaned snapshots\n"));
 +      DSS_DEBUG_LOG(("looking for old incomplete snapshots\n"));
        FOR_EACH_SNAPSHOT(s, i, sl) {
                if (snapshot_is_being_created(s))
                        continue;
@@@ -730,7 -734,6 +735,7 @@@ static int try_to_free_disk_space(void
        if (!low_disk_space)
                goto out;
        DSS_WARNING_LOG(("disk space low and nothing obvious to remove\n"));
 +      why = "oldest";
        victim = find_oldest_removable_snapshot(&sl);
        if (victim)
                goto remove;
@@@ -1068,7 -1071,7 +1073,7 @@@ static int change_to_dest_dir(void
        return ret;
  }
  
- static int check_config(const struct lls_command *cmd)
+ static int check_config(void)
  {
        int ret;
        uint32_t unit_interval = OPT_UINT32_VAL(DSS, UNIT_INTERVAL);
@@@ -1084,13 -1087,13 +1089,13 @@@
                DSS_ERROR_LOG(("bad number of intervals: %i\n", num_intervals));
                return -E_INVALID_NUMBER;
        }
-       if (cmd == CMD_PTR(RUN) || cmd == CMD_PTR(CREATE))
+       if (subcmd == CMD_PTR(RUN) || subcmd == CMD_PTR(CREATE))
                if (!OPT_GIVEN(DSS, SOURCE_DIR)) {
                        DSS_ERROR_LOG(("--source-dir required\n"));
                        return -E_SYNTAX;
                }
-       if (cmd == CMD_PTR(RUN) || cmd == CMD_PTR(CREATE)
-                       || cmd == CMD_PTR(LS) || cmd == CMD_PTR(PRUNE)) {
+       if (subcmd == CMD_PTR(RUN) || subcmd == CMD_PTR(CREATE)
+                       || subcmd == CMD_PTR(LS) || subcmd == CMD_PTR(PRUNE)) {
                if (!OPT_GIVEN(DSS, DEST_DIR)) {
                        DSS_ERROR_LOG(("--dest-dir required\n"));
                        return -E_SYNTAX;
@@@ -1228,7 -1231,7 +1233,7 @@@ static int handle_sighup(void
        ret = parse_config_file(true /* SIGHUP */, CMD_PTR(RUN));
        if (ret < 0)
                return ret;
-       ret = check_config(CMD_PTR(RUN));
+       ret = check_config();
        if (ret < 0)
                return ret;
        close_log(logfile);
@@@ -1698,13 -1701,6 +1703,13 @@@ static int com_ls(void
  }
  EXPORT_CMD_HANDLER(ls);
  
 +static int com_configtest(void)
 +{
 +      printf("Syntax Ok\n");
 +      return 0;
 +}
 +EXPORT_CMD_HANDLER(configtest);
 +
  static int setup_signal_handling(void)
  {
        int ret;
@@@ -1746,7 -1742,7 +1751,7 @@@ static void show_subcommand_summary(voi
        for (i = 1; (cmd = lls_cmd(i, dss_suite)); i++) {
                const char *name = lls_command_name(cmd);
                const char *purpose = lls_purpose(cmd);
 -              printf("%-10s%s\n", name, purpose);
 +              printf("%-11s%s\n", name, purpose);
        }
        exit(EXIT_SUCCESS);
  }
@@@ -1754,18 -1750,17 +1759,17 @@@
  int main(int argc, char **argv)
  {
        int ret;
-       const struct lls_command *cmd = CMD_PTR(DSS);
        char *errctx = NULL;
        unsigned num_inputs;
-       const struct dss_user_data *ud = NULL;
+       const struct dss_user_data *ud;
  
-       ret = lls_parse(argc, argv, cmd, &cmdline_lpr, &errctx);
+       ret = lls_parse(argc, argv, CMD_PTR(DSS), &cmdline_lpr, &errctx);
        if (ret < 0) {
                ret = lopsub_error(ret, &errctx);
                goto out;
        }
        lpr = cmdline_lpr;
-       ret = parse_config_file(false /* no SIGHUP */, cmd);
+       ret = parse_config_file(false /* no SIGHUP */, CMD_PTR(DSS));
        if (ret < 0)
                goto out;
        handle_version_and_help();
@@@ -1777,24 -1772,24 +1781,24 @@@
                ret = lopsub_error(ret, &errctx);
                goto out;
        }
-       cmd = lls_cmd(ret, dss_suite);
-       ret = lls_parse(num_inputs, argv + argc - num_inputs, cmd,
+       subcmd = lls_cmd(ret, dss_suite);
+       ret = lls_parse(num_inputs, argv + argc - num_inputs, subcmd,
                &cmdline_sublpr, &errctx);
        if (ret < 0) {
                ret = lopsub_error(ret, &errctx);
                goto out;
        }
        sublpr = cmdline_sublpr;
-       ret = parse_config_file(false /* no SIGHUP */, cmd);
+       ret = parse_config_file(false /* no SIGHUP */, subcmd);
        if (ret < 0)
                goto out;
-       ret = check_config(cmd);
+       ret = check_config();
        if (ret < 0)
                goto out;
        ret = setup_signal_handling();
        if (ret < 0)
                goto out;
-       ud = lls_user_data(cmd);
+       ud = lls_user_data(subcmd);
        ret = ud->handler();
        signal_shutdown();
  out:
@@@ -1807,8 -1802,8 +1811,8 @@@
        lls_free_parse_result(lpr, CMD_PTR(DSS));
        if (lpr != cmdline_lpr)
                lls_free_parse_result(cmdline_lpr, CMD_PTR(DSS));
-       lls_free_parse_result(sublpr, cmd);
+       lls_free_parse_result(sublpr, subcmd);
        if (sublpr != cmdline_sublpr)
-               lls_free_parse_result(cmdline_sublpr, cmd);
+               lls_free_parse_result(cmdline_sublpr, subcmd);
        exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);
  }