chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: implementation rotation
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index 94261f676350d6834b53d9ce222c975a4decb462..7a2b50b01783f0c2443e54d717c399d6550cd048 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-109,10
+109,10
@@
static JournalFile* find_journal(Server *s, uid_t uid) {
if (f)
return f;
if (f)
return f;
- if (asprintf(&p, "/var/log/journal/%lu.journal", (unsigned long) uid) < 0)
+ if (asprintf(&p, "/var/log/journal/
user-
%lu.journal", (unsigned long) uid) < 0)
return s->system_journal;
return s->system_journal;
- r = journal_file_open(p, O_RDWR|O_CREAT, 0640, &f);
+ r = journal_file_open(p, O_RDWR|O_CREAT, 0640,
NULL,
&f);
free(p);
if (r < 0)
free(p);
if (r < 0)
@@
-386,7
+386,7
@@
static int system_journal_open(Server *s) {
if (!fn)
return -ENOMEM;
if (!fn)
return -ENOMEM;
- r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, &s->system_journal);
+ r = journal_file_open(fn, O_RDWR|O_CREAT, 0640,
NULL,
&s->system_journal);
free(fn);
if (r >= 0) {
free(fn);
if (r >= 0) {
@@
-411,7
+411,7
@@
static int system_journal_open(Server *s) {
fn = join("/run/log/journal/", ids, "/system.journal", NULL);
if (!fn)
return -ENOMEM;
fn = join("/run/log/journal/", ids, "/system.journal", NULL);
if (!fn)
return -ENOMEM;
- r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, &s->runtime_journal);
+ r = journal_file_open(fn, O_RDWR|O_CREAT, 0640,
NULL,
&s->runtime_journal);
free(fn);
if (r < 0) {
free(fn);
if (r < 0) {
@@
-584,7
+584,7
@@
int main(int argc, char *argv[]) {
sd_notify(false,
"READY=1\n"
"STATUS=Processing messages...");
sd_notify(false,
"READY=1\n"
"STATUS=Processing messages...");
-
+#
for (;;) {
struct epoll_event event;
for (;;) {
struct epoll_event event;