lp://staging/~jamesodhunt/upstart/job-logging-for-user-jobs

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1331. By James Hunt on 2011-12-09

Temporary commit @ Fri Dec 9 14:18:59 UTC 2011.

1330. By James Hunt on 2011-12-06

Introduction of 'log' argument to 'console' stanza allowing
job output to be captured. Note this feature is only available for
system jobs currently.

* contrib/vim/syntax/upstart.vim: Added 'log' and missing
  'none'.
* init/Makefile.am: Update for log.c, log.h and test_log.c.
* init/job.c: job_new(): Initialize log.
* init/job.h: Add Log pointer to Job.
* init/job_class.c:
  - XXX: behaviour change: Default for 'console'
    is now CONSOLE_LOG rather than CONSOLE_NONE.
    Rationale is that if a job does produce output, you want to see
    it since the chances are it will contain useful error details.
  - Added default_console variable.
  - job_class_console_type(): New function to parse console type
    string.
* init/job_class.h:
  - Added CONSOLE_LOG to ConsoleType and updated documentation
    for ConsoleType.
  - Added prototype for job_class_console_type().
* init/job_process.c:
  - New log_dir and disable_job_logging variables.
  - job_process_run(): Updated to reflect new parameter for
    job_process_spawn().
  - job_process_spawn(): Now accepts a Job rather than a
    JobClass to allow job->log and class->console to be handled
    appropriately. Now creates pty master and slave fds for
    console logging. Simplified code for file descriptor
    switching by using new job_process_remap_fd().
  - job_process_error_read(): Added entries for:
    - JOB_PROCESS_ERROR_OPENPT_MASTER
    - JOB_PROCESS_ERROR_OPENPT_UNLOCKPT
    - JOB_PROCESS_ERROR_PTSNAME
    - JOB_PROCESS_ERROR_OPENPT_SLAVE
  - job_process_log_path(): New function that returns full path to log
    file for specified Job.
  - job_process_remap_fd(): New function to ensure file
    descriptors do not collide.
* init/job_process.h:
  - Updated JobProcessErrorType with new entries:
    - JOB_PROCESS_ERROR_OPENPT_MASTER
    - JOB_PROCESS_ERROR_OPENPT_UNLOCKPT
    - JOB_PROCESS_ERROR_PTSNAME
    - JOB_PROCESS_ERROR_OPENPT_SLAVE
  - job_process_spawn(): Updated prototype.
  - job_process_log_path(): Added prototype.
* init/main.c:
  - handle_logdir(): New function for overriding log directory.
  - console_type_setter(): New Function to handle selection of
    default console value.
  - Added following command-line options:
    - '--default-console'
    - '--logdir'
    - '--no-log'
* init/man/init.5:
  - Update and restructure of section on 'console' stanza.
  - Added a FILES section.
* init/man/init.8: Updated with details of new options:
  - '--default-console'
  - '--logdir'
  - '--no-log'
* init/parse_job.c: stanza_console(): Updated for "log".
* init/paths.h: Added defines for JOB_LOGDIR and LOGDIR_ENV.
* init/session.c:
  - Added missing function headers.
  - New functions: session_user_home() and session_user_group().
* init/session.h: Added prototypes for session_user_home() and
  session_user_group().
* init/system.c: system_setup_console(): Update for CONSOLE_LOG.
* init/test_conf.c:
  - TEST_FORCE_WATCH_UPDATE(): Removed debug.
  - test_override(): Removed erroneous comment.
  - test_select_job(): Added variable attributes to keep gcc 4.6 happy.
* init/test_event.c: Explicitly set console type to CONSOLE_NONE to
  retain behaviour of existing tests.
* init/test_job.c:
  - test_job_new(): Ensure log object not created on Job instantiation.
  - test_change_state(): Explicitly set console type to CONSOLE_NONE to
    retain behaviour of existing tests.
* init/test_job_class.c:
  - test_new(): Ensure console type now defaults to CONSOLE_LOG.
  - Explicitly set console type to CONSOLE_NONE to retain behaviour of
    existing tests.
* init/test_job_process.c:
  - Added various new macros to simplify test code.
  - child(): New child_tests added for TEST_OUTPUT and TEST_SIGNALS.
  - get_available_pty_count(): New function.
  - Explicitly set console type to CONSOLE_NONE to retain behaviour of
    existing tests.
  - test_run(): Added new tests for CONSOLE_LOG.
  - test_spawn(): Added new tests for CONSOLE_LOG.
  - test_log_path(): New function.
  - test_handler(): Added UPSTART_LOGDIR support to
  - main():
    - Update to allow number of forks to be specified when run as a child
      process.
    - Added call to test_log_path().
    - initialize various subsystems since before, functions run from
      main() had to be run in the order specified and exactly as listed
     (certain tests relied on previous tests initializing a subsystem
     which gives unexpected results and thus confusing behaviour
     if the order of tests is changed).
* init/test_parse_job.c: Added new test to test_stanza_console() for
  "console log".
* util/tests/test_user_sessions.sh: Added tests for job logging
  to ensure no unexpected output recorded for user jobs.

1329. By Scott James Remnant (Canonical) on 2011-08-11

* init/job_process.c (job_process_spawn): Can't return on
dup2() error, we're in the child. Return an error back to
the child properly.

1328. By Scott James Remnant (Canonical) on 2011-08-11

* init/job_process.c (job_process_spawn), init/main.c: error
should be ENOENT

1327. By Scott James Remnant (Canonical) on 2011-08-11

* init/job_class.c, init/job_class.h: Move constants into the
header file so they can be found from other source files.
* init/job_process.c (job_process_spawn): Only adjust the OOM
score if it isn't the default
* init/main.c: Apply the default OOM score to the init process
itself.

1326. By Scott James Remnant (Canonical) on 2011-08-11

* init/main.c: Deal with failure to setup the system console by
falling back to /dev/null, so we don't end up without default fds
and castrate the process.

1325. By Scott James Remnant <email address hidden> on 2011-08-11

* init/job_class.c (job_class_new): nit, use #defines for the default
nice level and oom score adjustment.

1324. By James Hunt on 2011-07-25

* init/man/init.5: Explain that symbolic links are not supported.

1323. By James Hunt on 2011-07-25

* util/tests/test_user_sessions.sh: Be a little more verbose to give
  invoker a warm feeling that the tests have actually passed.

1322. By James Hunt on 2011-07-25

* init/session.c: session_from_dbus(): Handle case where a users
  home directory is changed or where a uid is re-used for a
  different username.
* init/session.h: Updated comments for Session object.