← Back to branch summary

~ubuntu-branches/ubuntu/precise/upstart/precise

« back to all changes in this revision

Viewing changes to init/main.c

  • Committer: James Hunt
  • Date: 2012-01-06 16:12:52 UTC
  • Revision ID: james.hunt@ubuntu.com-20120106161252-id7duyzso21j9icy
Tags: 1.4-0ubuntu2
init/main.c: Temporarily disable default job logging whilst
investigating bug 912558 (can be re-enabled with
_temporary_ '--log' option).

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/main.c
121
121
 
122
122
extern int          disable_sessions;
123
123
extern int          disable_job_logging;
 
124
int                 force_logging;
124
125
extern int          use_session_bus;
125
126
extern int          default_console;
126
127
extern char        *log_dir;
138
139
        { 0, "default-console", N_("default value for console stanza"),
139
140
                NULL, "VALUE", NULL, console_type_setter },
140
141
 
 
142
        { 0, "log", N_("enable job logging"),
 
143
                NULL, NULL, &force_logging, NULL },
 
144
 
141
145
        { 0, "logdir", N_("specify alternative directory to store job output logs in"),
142
146
                NULL, "DIR", &log_dir, NULL },
143
147
 
181
185
                  "process id 1 to denote its special status.  When executed "
182
186
                  "by a user process, it will actually run /sbin/telinit."));
183
187
 
 
188
        /* Temporarily disable job logging (bug 912558) */
 
189
        disable_job_logging = 1;
 
190
 
184
191
        args = nih_option_parser (NULL, argc, argv, options, FALSE);
185
192
        if (! args)
186
193
                exit (1);
188
195
        handle_confdir ();
189
196
        handle_logdir ();
190
197
 
 
198
        if (force_logging)
 
199
                disable_job_logging = 0;
 
200
 
191
201
        if (disable_job_logging)
192
202
                nih_debug ("Job logging disabled");
193
203