Repositories / mmondor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b3e852e)
Added support for new Syslog object
authorMatthew Mondor <mmondor@pulsar-zone.net>
Sat, 28 Oct 2006 22:02:52 +0000 (22:02 +0000)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Sat, 28 Oct 2006 22:02:52 +0000 (22:02 +0000)
mmsoftware/js/js-appserv/src/GNUmakefile patch | blob | blame | history
mmsoftware/js/js-appserv/src/js-appserv.c patch | blob | blame | history
mmsoftware/js/js-sh/src/GNUmakefile patch | blob | blame | history
mmsoftware/js/js-sh/src/js-sh.c patch | blob | blame | history

diff --git a/mmsoftware/js/js-appserv/src/GNUmakefile b/mmsoftware/js/js-appserv/src/GNUmakefile
index 956c162..bcc6a0f 100644 (file)
--- a/mmsoftware/js/js-appserv/src/GNUmakefile
+++ b/mmsoftware/js/js-appserv/src/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 2006/10/26 01:16:21 mmondor Exp $
+# $Id: GNUmakefile,v 1.5 2006/10/28 22:02:51 mmondor Exp $
 
 CFLAGS += -Wall -DDEBUG
 
@@ -18,7 +18,7 @@ GD_LDFLAGS += -lgd
 MMOBJS := $(addprefix ../../../mmlib/,mmpool.o mmlog.o mmreadcfg.o \
        mmstring.o mmhash.o mmalarm.o mmheap.o mmlimitrate.o mmserver2.o)
 JSOBJS := $(addprefix ../../classes/,js_gcroot.o js_errno.o js_fd.o js_file.o \
-       js_pgsql.o js_dir.o js_gd.o)
+       js_pgsql.o js_dir.o js_gd.o js_syslog.o)
 
 
 CFLAGS += $(JS_CFLAGS) $(PG_CFLAGS) $(GD_CFLAGS) -I. -I../../../mmlib \
diff --git a/mmsoftware/js/js-appserv/src/js-appserv.c b/mmsoftware/js/js-appserv/src/js-appserv.c
index 919cc78..c9e2ad0 100644 (file)
--- a/mmsoftware/js/js-appserv/src/js-appserv.c
+++ b/mmsoftware/js/js-appserv/src/js-appserv.c
@@ -1,4 +1,4 @@
-/* $Id: js-appserv.c,v 1.5 2006/10/26 01:16:21 mmondor Exp $ */
+/* $Id: js-appserv.c,v 1.6 2006/10/28 22:02:51 mmondor Exp $ */
 
 /*
  * Copyright (C) 2006, Matthew Mondor
@@ -73,6 +73,7 @@
 #include <mmserver2.h>
 
 #include <js_gcroot.h>
+#include <js_syslog.h>
 #include <js_errno.h>
 #include <js_fd.h>
 #include <js_file.h>
@@ -675,6 +676,10 @@ context_create(JSRuntime *rt, size_t stacksize, JSObject **obj)
                syslog(LOG_NOTICE, "context_create() - js_InitGCRoot()");
                goto err;
        }
+       if (!js_InitSyslogClass(ctx, *obj)) {
+               syslog(LOG_NOTICE, "context_create() - js_InitSyslogClass()");
+               goto err;
+       }
        if (!js_InitErrnoClass(ctx, *obj)) {
                syslog(LOG_NOTICE, "context_create() - js_InitErrnoClass()");
                goto err;
diff --git a/mmsoftware/js/js-sh/src/GNUmakefile b/mmsoftware/js/js-sh/src/GNUmakefile
index c74408c..bfa0bc1 100644 (file)
--- a/mmsoftware/js/js-sh/src/GNUmakefile
+++ b/mmsoftware/js/js-sh/src/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.6 2006/10/18 05:07:48 mmondor Exp $
+# $Id: GNUmakefile,v 1.7 2006/10/28 22:02:52 mmondor Exp $
 
 #CFLAGS += -g
 CFLAGS += -Wall
@@ -16,7 +16,7 @@ GD_LDFLAGS += -lgd
 
 MMOBJS := $(addprefix ../../../mmlib/,mmpool.o mmhash.o mmlog.o mmstring.o)
 JSOBJS := $(addprefix ../../classes/,js_gcroot.o js_fd.o js_errno.o \
-       js_signal.o js_file.o js_pgsql.o js_dir.o js_fs.o js_gd.o)
+       js_signal.o js_file.o js_pgsql.o js_dir.o js_fs.o js_gd.o js_syslog.o)
 
 CFLAGS += $(JS_CFLAGS) $(PG_CFLAGS) $(GD_CFLAGS) -I../../../mmlib \
        -I../../classes
diff --git a/mmsoftware/js/js-sh/src/js-sh.c b/mmsoftware/js/js-sh/src/js-sh.c
index 20fd99f..3937020 100644 (file)
--- a/mmsoftware/js/js-sh/src/js-sh.c
+++ b/mmsoftware/js/js-sh/src/js-sh.c
@@ -1,4 +1,4 @@
-/* $Id: js-sh.c,v 1.9 2006/10/24 12:42:51 mmondor Exp $ */
+/* $Id: js-sh.c,v 1.10 2006/10/28 22:02:52 mmondor Exp $ */
 
 /*
  * Copyright (c) 2004-2005, Matthew Mondor
@@ -44,6 +44,7 @@
 #include <js_pgsql.h>
 #include <js_dir.h>
 #include <js_gd.h>
+#include <js_syslog.h>
 
 
 
@@ -66,8 +67,9 @@
 typedef struct {
        JSRuntime       *rt;
        JSContext       *ctx;
-       JSObject        *global, *class_fd, *class_errno, *class_signal,
-                       *class_file, *class_pgsql, *class_dir, *class_gd;
+       JSObject        *global, *class_syslog, *class_fd, *class_errno,
+                       *class_signal, *class_file, *class_pgsql, *class_dir,
+                       *class_gd;
 } js_context_t;
 
 /*
@@ -236,6 +238,8 @@ js_context_init(size_t gc_size, size_t stack_size)
                NULL)) == NULL ||
            !JS_InitStandardClasses(cctx->ctx, cctx->global) ||
            !js_InitGCRoot(cctx->ctx) ||
+           (cctx->class_syslog = js_InitSyslogClass(cctx->ctx, cctx->global))
+               == NULL ||
            (cctx->class_fd = js_InitFDClass(cctx->ctx, cctx->global))
                == NULL ||
            (cctx->class_errno = js_InitErrnoClass(cctx->ctx, cctx->global))
MMSoftware