pygos/init
1
0
Fork 0
mirror of https://github.com/pygos/init.git synced 2024-11-22 19:19:47 +01:00
Code Issues Releases Wiki Activity

usyslogd: store logs in subdirectory based on service identifier

Browse source 
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-06-17 16:48:50 +02:00
parent 8a8f49a501
commit 9878e69ebe
4 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
syslogd/logfile.c
View file

@ -15,39 +15,66 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#include "logfile.h" #include "logfile.h"
logfile_t *logfile_create(const char *name, int facility) logfile_t *logfile_create(const char *ident, const char *name, int facility)
{ {
int dfd = AT_FDCWD;
logfile_t *file; logfile_t *file;
size_t size;
file = calloc(1, sizeof(*file) + strlen(name) + 1); size = sizeof(*file) + 1;
if (ident != NULL)
size += strlen(ident);
file = calloc(1, size);
if (file == NULL) { if (file == NULL) {
perror("calloc"); perror("calloc");
return NULL; return NULL;
} }
strcpy(file->name, name); if (ident != NULL) {
strcpy(file->ident, ident);
if (mkdir(file->ident, 0750) != 0 && errno != EEXIST) {
perror(file->ident);
goto fail;
}
dfd = open(file->ident, O_DIRECTORY | O_RDONLY);
if (dfd < 0) {
perror(file->ident);
goto fail;
}
}
file->facility = facility; file->facility = facility;
file->fd = open(file->name, O_WRONLY | O_CREAT, 0640); file->fd = openat(dfd, name, O_WRONLY | O_CREAT, 0640);
if (file->fd < 0) if (file->fd < 0) {
perror(name);
goto fail; goto fail;
}
if (lseek(file->fd, 0, SEEK_END)) if (lseek(file->fd, 0, SEEK_END))
goto fail; goto fail;
if (dfd != AT_FDCWD)
close(dfd);
return file; return file;
fail: fail:
perror(file->name); if (dfd != AT_FDCWD)
close(dfd);
free(file); free(file);
return NULL; return NULL;
} }

4
syslogd/logfile.h
View file

@ -23,10 +23,10 @@ typedef struct logfile_t {
int facility; int facility;
int fd; int fd;
char name[]; char ident[];
} logfile_t; } logfile_t;
logfile_t *logfile_create(const char *name, int facility); logfile_t *logfile_create(const char *ident, const char *name, int facility);
void logfile_destroy(logfile_t *file); void logfile_destroy(logfile_t *file);

11
syslogd/main.c
View file

@ -134,12 +134,16 @@ static int print_to_log(const syslog_msg_t *msg)
return -1; return -1;
for (log = logfiles; log != NULL; log = log->next) { for (log = logfiles; log != NULL; log = log->next) {
if (log->facility == msg->facility) if (log->facility != msg->facility)
continue;
if (msg->ident == NULL && log->ident[0] == '\0')
break;
if (msg->ident != NULL && strcmp(msg->ident, log->ident) == 0)
break; break;
} }
if (log == NULL) { if (log == NULL) {
log = logfile_create(fac_name, msg->facility); log = logfile_create(msg->ident, fac_name, msg->facility);
if (log == NULL) if (log == NULL)
return -1; return -1;
log->next = logfiles; log->next = logfiles;
@ -149,8 +153,7 @@ static int print_to_log(const syslog_msg_t *msg)
gmtime_r(&msg->timestamp, &tm); gmtime_r(&msg->timestamp, &tm);
strftime(timebuf, sizeof(timebuf), "%FT%T", &tm); strftime(timebuf, sizeof(timebuf), "%FT%T", &tm);
logfile_write(log, "[%s][%s][%s][%u] %s", timebuf, lvl_str, logfile_write(log, "[%s][%s][%u] %s", timebuf, lvl_str, msg->pid,
msg->ident ? msg->ident : "", msg->pid,
msg->message); msg->message);
return 0; return 0;
} }

11
syslogd/proto.c
View file

@ -169,9 +169,20 @@ int syslog_msg_parse(syslog_msg_t *msg, char *str)
ident = NULL; ident = NULL;
} }
if (ident != NULL && ident[0] == '\0')
ident = NULL;
msg->timestamp = mktime(&tstamp); msg->timestamp = mktime(&tstamp);
msg->pid = pid; msg->pid = pid;
msg->ident = ident; msg->ident = ident;
msg->message = str; msg->message = str;
if (ident != NULL) {
for (ptr = ident; *ptr != '\0'; ++ptr) {
if (!isalnum(*ptr))
*ptr = '_';
}
}
return 0; return 0;
} }