Author: cgay
Date: Mon Nov 29 16:21:23 2004
New Revision: 9631
Modified:
trunk/libraries/koala/sources/koala/library-unix.dylan
trunk/libraries/koala/sources/koala/library.dylan
trunk/libraries/koala/sources/koala/vhost.dylan
Log:
job: 7199
Fix a few bugs from the previous checkin on this job.
Modified: trunk/libraries/koala/sources/koala/library-unix.dylan
==============================================================================
--- trunk/libraries/koala/sources/koala/library-unix.dylan (original)
+++ trunk/libraries/koala/sources/koala/library-unix.dylan Mon Nov 29
16:21:23 2004
@@ -7,11 +7,15 @@
define library koala
- use functional-dylan, import: { dylan-extensions };
+ use functional-dylan,
+ import: { dylan-extensions };
use common-dylan;
- use io;
- use network;
- use system;
+ use io,
+ import: { format, standard-io, streams };
+ use network,
+ import: { sockets };
+ use system,
+ import: { date, file-system, locators, operating-system, threads };
//use ssl-sockets; // until integrated into FD?
use xml-parser;
use xml-rpc-common;
@@ -25,7 +29,8 @@
define module utilities
use dylan;
- use common-extensions, exclude: { format-to-string };
+ use common-extensions,
+ exclude: { format-to-string, split };
use dylan-extensions,
import: { element-no-bounds-check,
element-no-bounds-check-setter,
@@ -35,7 +40,8 @@
// case-insensitive-equal,
// case-insensitive-string-hash
};
- use file-system, import: { with-open-file, <file-does-not-exist-error> };
+ use file-system,
+ import: { with-open-file, <file-does-not-exist-error> };
use date;
use streams;
use locators;
@@ -43,7 +49,8 @@
use file-system;
use format;
use threads;
- use dylan-basics, export: all;
+ use dylan-basics,
+ export: all;
export
// General one-off utilities
@@ -109,18 +116,15 @@
string->integer,
// Logging
- with-log-output-to,
<log-level>,
- <log-error>, log-error,
- <log-warning>, log-warning,
- <log-info>, log-info,
- <log-debug>, log-debug, log-debug-if,
- <log-verbose>, log-verbose,
- <log-copious>, log-copious,
- log-message,
+ <log-target>, <null-log-target>, <stream-log-target>, <file-log-target>,
+ <rolling-file-log-target>,
+ <log-error>, <log-warning>, <log-info>, <log-debug>, <log-verbose>,
<log-copious>,
+ log-error, log-warning, log-info, log-debug, log-debug-if, log-verbose,
log-copious,
+ log, log-raw,
log-date,
- add-log-level, remove-log-level, clear-log-levels,
- as-common-logfile-date, as-rfc-1123-date, log-logfile;
+ log-level, log-level-setter,
+ as-common-logfile-date, as-rfc-1123-date;
end module utilities;
@@ -137,7 +141,7 @@
read-message-headers,
header-value;
- // Server proper
+ // Basic server stuff
create
http-server, // Get the active HTTP server object.
ensure-server, // Get (or create) the active HTTP server object.
@@ -160,6 +164,11 @@
count-form-values,
application-error;
+ // Virtual hosts
+ create
+ <virtual-host>, *virtual-host*,
+ document-root, locator-below-document-root?;
+
// Responses
create
<response>,
@@ -179,6 +188,11 @@
//remove-attribute,
set-session-max-age;
+ // Logging
+ create
+ // These are wrappers for the defs by the same name in the utilities
module.
+ log-copious, log-verbose, log-debug, log-info, log-warning, log-error;
+
// XML-RPC
create
register-xml-rpc-method;
@@ -189,6 +203,7 @@
// Errors
create
+ access-forbidden-error,
<koala-api-error>;
// Not sure if these should really be exported.
@@ -215,9 +230,15 @@
define module httpi // http internals
use dylan;
use threads; // from dylan lib
- use common-extensions, exclude: { format-to-string };
+ use common-extensions, exclude: { format-to-string, split };
use dylan-basics;
- use utilities;
+ use utilities,
+ rename: { log-copious => %log-copious,
+ log-verbose => %log-verbose,
+ log-debug => %log-debug,
+ log-info => %log-info,
+ log-warning => %log-warning,
+ log-error => %log-error };
use koala;
use koala-extender;
@@ -235,7 +256,6 @@
// case-insensitive-string-hash
};
use format;
- use format-out;
use standard-io;
use streams;
use sockets,
@@ -251,17 +271,27 @@
define module dsp
use dylan;
- use common-extensions;
+ use common-extensions,
+ exclude: { split };
use dylan-basics;
- use koala, export: all;
- use utilities, export: all;
+ use koala,
+ export: all;
+ use utilities,
+ rename: { log-copious => %log-copious,
+ log-verbose => %log-verbose,
+ log-debug => %log-debug,
+ log-info => %log-info,
+ log-warning => %log-warning,
+ log-error => %log-error },
+ export: all;
- use locators, rename: {<http-server> => <http-server-url>,
- <ftp-server> => <ftp-server-url>,
- <file-server> => <file-server-url>};
- use format, rename: { format-to-string => sformat };
+ use locators,
+ rename: {<http-server> => <http-server-url>,
+ <ftp-server> => <ftp-server-url>,
+ <file-server> => <file-server-url>};
+ use format,
+ rename: { format-to-string => sformat };
use threads;
- use format-out;
use standard-io;
use streams;
//use sockets, rename: { start-server => start-socket-server };
Modified: trunk/libraries/koala/sources/koala/library.dylan
==============================================================================
--- trunk/libraries/koala/sources/koala/library.dylan (original)
+++ trunk/libraries/koala/sources/koala/library.dylan Mon Nov 29 16:21:23 2004
@@ -31,7 +31,8 @@
define module utilities
use dylan;
- use common-extensions, exclude: { format-to-string, split };
+ use common-extensions,
+ exclude: { format-to-string, split };
use dylan-extensions,
import: { element-no-bounds-check,
element-no-bounds-check-setter,
@@ -41,7 +42,8 @@
// case-insensitive-equal,
// case-insensitive-string-hash
};
- use file-system, import: { with-open-file, <file-does-not-exist-error> };
+ use file-system,
+ import: { with-open-file, <file-does-not-exist-error> };
use date;
use streams;
use locators;
@@ -49,7 +51,8 @@
use file-system;
use format;
use threads;
- use dylan-basics, export: all;
+ use dylan-basics,
+ export: all;
export
// General one-off utilities
@@ -140,7 +143,7 @@
read-message-headers,
header-value;
- // Server proper
+ // Basic server stuff
create
http-server, // Get the active HTTP server object.
ensure-server, // Get (or create) the active HTTP server object.
@@ -163,6 +166,11 @@
count-form-values,
application-error;
+ // Virtual hosts
+ create
+ <virtual-host>, *virtual-host*,
+ document-root, locator-below-document-root?;
+
// Responses
create
<response>,
@@ -197,6 +205,7 @@
// Errors
create
+ access-forbidden-error,
<koala-api-error>;
// Not sure if these should really be exported.
@@ -265,9 +274,11 @@
define module dsp
use dylan;
- use common-extensions, exclude: { split };
+ use common-extensions,
+ exclude: { split };
use dylan-basics;
- use koala, export: all;
+ use koala,
+ export: all;
use utilities,
rename: { log-copious => %log-copious,
log-verbose => %log-verbose,
@@ -277,10 +288,12 @@
log-error => %log-error },
export: all;
- use locators, rename: {<http-server> => <http-server-url>,
- <ftp-server> => <ftp-server-url>,
- <file-server> => <file-server-url>};
- use format, rename: { format-to-string => sformat };
+ use locators,
+ rename: {<http-server> => <http-server-url>,
+ <ftp-server> => <ftp-server-url>,
+ <file-server> => <file-server-url>};
+ use format,
+ rename: { format-to-string => sformat };
use threads;
use standard-io;
use streams;
Modified: trunk/libraries/koala/sources/koala/vhost.dylan
==============================================================================
--- trunk/libraries/koala/sources/koala/vhost.dylan (original)
+++ trunk/libraries/koala/sources/koala/vhost.dylan Mon Nov 29 16:21:23 2004
@@ -203,12 +203,12 @@
//
define constant $default-virtual-host :: <virtual-host>
= begin
- let stdout-log = make(<null-log-target>, stream: *standard-output*);
+ let stdout-log = make(<stream-log-target>, stream: *standard-output*);
make(<virtual-host>,
name: "default",
activity-log: stdout-log,
debug-log: stdout-log,
- error-log: make(<null-log-target>, stream: *standard-error*))
+ error-log: make(<stream-log-target>, stream: *standard-error*))
end;
// If this is true, then requests directed at hosts that don't match any
_______________________________________________
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
https://gauss.gwydiondylan.org/mailman/listinfo/gd-chatter
|
