diff options
-rw-r--r-- | Documentation/README | 9 | ||||
-rw-r--r-- | Makefile | 19 | ||||
-rw-r--r-- | mod_log_sql.c | 45 |
3 files changed, 20 insertions, 53 deletions
diff --git a/Documentation/README b/Documentation/README index df96ba1..349b0ac 100644 --- a/Documentation/README +++ b/Documentation/README | |||
@@ -1,6 +1,13 @@ | |||
1 | $Id: README,v 1.1 2002/11/14 22:52:56 helios Exp $ | 1 | $Id: README,v 1.2 2002/12/10 20:37:29 helios Exp $ |
2 | 2 | ||
3 | The "original" document is the LyX file "documentation.lyx" -- all other | 3 | The "original" document is the LyX file "documentation.lyx" -- all other |
4 | files here are derived from it. The most visually accurate document | 4 | files here are derived from it. The most visually accurate document |
5 | and the one I'd recommend reading is the PostScript (.ps) file, although | 5 | and the one I'd recommend reading is the PostScript (.ps) file, although |
6 | a whole host of formats are made available here to suit your preference. | 6 | a whole host of formats are made available here to suit your preference. |
7 | |||
8 | To read the HTML docs, open HTML/documentation.html in your browser. | ||
9 | To read the .dvi file, use Xdvi or kdvi. | ||
10 | To read the .ps file, use gv or kghostview. | ||
11 | To read the .lyx file, use LyX. | ||
12 | To read the .txt file, use less. | ||
13 | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile,v 1.18 2002/12/10 19:43:21 helios Exp $ | 1 | # $Id: Makefile,v 1.19 2002/12/10 20:37:28 helios Exp $ |
2 | 2 | ||
3 | ########################################################################### | 3 | ########################################################################### |
4 | # Important: | 4 | # Important: |
@@ -12,19 +12,19 @@ APXS = $(APACHEINST)/bin/apxs | |||
12 | MYSQLLIBS = /usr/lib | 12 | MYSQLLIBS = /usr/lib |
13 | MYSQLHDRS = /usr/include/mysql | 13 | MYSQLHDRS = /usr/include/mysql |
14 | 14 | ||
15 | #MODSSLHDRS = /usr/local/src/apache_1.3.27-dso/src/modules/ssl | 15 | MODSSLHDRS = /usr/local/src/apache_1.3.27-dso/src/modules/ssl |
16 | #DB1HDRS = /usr/include/db1 | 16 | DB1HDRS = /usr/include/db1 |
17 | 17 | ||
18 | ########################################################################### | 18 | ########################################################################### |
19 | # Don't uncomment this without reading the "Optimizing for a busy database" | 19 | # Don't uncomment this without reading the "Optimizing for a busy database" |
20 | # section in the documentation (under "Advanced logging scenarios"). | 20 | # section in the documentation (under "Advanced logging scenarios"). |
21 | 21 | ||
22 | MYSQLDELAYED = -DWANT_DELAYED_MYSQL_INSERT | 22 | #MYSQLDELAYED = -DWANT_DELAYED_MYSQL_INSERT |
23 | 23 | ||
24 | ########################################################################### | 24 | ########################################################################### |
25 | # Rarely if ever have to touch below here. | 25 | # Rarely if ever have to touch below here. |
26 | 26 | ||
27 | MLMVERS = 1.18 | 27 | MLMVERS = 1.18pre1 |
28 | #APXSGDB = -Wc,-g | 28 | #APXSGDB = -Wc,-g |
29 | APXSOPTS = -Wc,-O2 -Wc,-Wall | 29 | APXSOPTS = -Wc,-O2 -Wc,-Wall |
30 | STATOPTS = -fpic -O2 -Wall | 30 | STATOPTS = -fpic -O2 -Wall |
@@ -34,8 +34,8 @@ RM = /bin/rm | |||
34 | LYX = /usr/bin/lyx | 34 | LYX = /usr/bin/lyx |
35 | LATEX = /usr/bin/latex | 35 | LATEX = /usr/bin/latex |
36 | DVIPS = /usr/bin/dvips | 36 | DVIPS = /usr/bin/dvips |
37 | LINKS = /usr/bin/links | 37 | LINKS = /usr/bin/lynx |
38 | L2H = /usr/local/bin/latex2html | 38 | L2H = /usr/bin/latex2html |
39 | WEBSERV = gw0.corp | 39 | WEBSERV = gw0.corp |
40 | 40 | ||
41 | STATFLAGS = -I$(APACHEINST)/include | 41 | STATFLAGS = -I$(APACHEINST)/include |
@@ -87,6 +87,9 @@ distro: documentation | |||
87 | @cd ..; tar zcf mod_log_sql-$(MLMVERS).tar.gz --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.gz $(WEBSERV):$(APACHEINST)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.gz | 87 | @cd ..; tar zcf mod_log_sql-$(MLMVERS).tar.gz --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.gz $(WEBSERV):$(APACHEINST)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.gz |
88 | @ssh $(WEBSERV) "ln -sf mod_log_sql-$(MLMVERS).tar.gz $(APACHEINST)/html/mod_log_sql/mod_log_sql.tar.gz" | 88 | @ssh $(WEBSERV) "ln -sf mod_log_sql-$(MLMVERS).tar.gz $(APACHEINST)/html/mod_log_sql/mod_log_sql.tar.gz" |
89 | 89 | ||
90 | pre-distro: documentation | ||
91 | @cd ..; tar zcf mod_log_sql-$(MLMVERS).tar.gz --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.gz $(WEBSERV):$(APACHEINST)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.gz | ||
92 | |||
90 | documentation: Documentation/documentation.lyx | 93 | documentation: Documentation/documentation.lyx |
91 | @echo "Creating LaTeX docs..." | 94 | @echo "Creating LaTeX docs..." |
92 | @$(LYX) --export latex Documentation/documentation.lyx 2>/dev/null | 95 | @$(LYX) --export latex Documentation/documentation.lyx 2>/dev/null |
@@ -102,7 +105,7 @@ documentation: Documentation/documentation.lyx | |||
102 | @$(L2H) -local_icons -show_section_numbers -split 4 -navigation -noindex_in_navigation -contents_in_navigation -dir Documentation/HTML Documentation/documentation.tex >/dev/null 2>&1 | 105 | @$(L2H) -local_icons -show_section_numbers -split 4 -navigation -noindex_in_navigation -contents_in_navigation -dir Documentation/HTML Documentation/documentation.tex >/dev/null 2>&1 |
103 | @echo "Creating plain text docs..." | 106 | @echo "Creating plain text docs..." |
104 | @$(L2H) -show_section_numbers -split 0 -dir Documentation/ Documentation/documentation.tex >/dev/null 2>&1 | 107 | @$(L2H) -show_section_numbers -split 0 -dir Documentation/ Documentation/documentation.tex >/dev/null 2>&1 |
105 | @$(LINKS) -dump Documentation/documentation.html > Documentation/documentation.txt 2>/dev/null | 108 | @$(LINKS) -dump -nolist -width=120 -dump Documentation/documentation.html > Documentation/documentation.txt 2>/dev/null |
106 | @echo "Cleaning up..." | 109 | @echo "Cleaning up..." |
107 | @$(RM) -f Documentation/*.html Documentation/WARNINGS Documentation/*.pl Documentation/*.aux Documentation/*.css Documentation/*.toc Documentation/*.log Documentation/*.old Documentation/*.png Documentation/images.tex | 110 | @$(RM) -f Documentation/*.html Documentation/WARNINGS Documentation/*.pl Documentation/*.aux Documentation/*.css Documentation/*.toc Documentation/*.log Documentation/*.old Documentation/*.png Documentation/images.tex |
108 | @$(RM) -f Documentation/HTML/WARNINGS Documentation/HTML/*.pl Documentation/HTML/*.log Documentation/HTML/*.aux Documentation/HTML/*.tex Documentation/HTML/*.old Documentation/HTML/index.html | 111 | @$(RM) -f Documentation/HTML/WARNINGS Documentation/HTML/*.pl Documentation/HTML/*.log Documentation/HTML/*.aux Documentation/HTML/*.tex Documentation/HTML/*.old Documentation/HTML/index.html |
diff --git a/mod_log_sql.c b/mod_log_sql.c index 117111b..d58839b 100644 --- a/mod_log_sql.c +++ b/mod_log_sql.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mod_log_sql.c,v 1.20 2002/12/10 19:43:21 helios Exp $ */ | 1 | /* $Id: mod_log_sql.c,v 1.21 2002/12/10 20:37:28 helios Exp $ */ |
2 | 2 | ||
3 | /* --------* | 3 | /* --------* |
4 | * DEFINES * | 4 | * DEFINES * |
@@ -1677,46 +1677,3 @@ module sql_log_module = { | |||
1677 | #endif | 1677 | #endif |
1678 | 1678 | ||
1679 | }; | 1679 | }; |
1680 | |||
1681 | |||
1682 | |||
1683 | /* Make the tables if we're supposed to. */ | ||
1684 | /* | ||
1685 | if ((cls->table_made != 1) && (create_tables != 0)) { | ||
1686 | result = safe_create_tables(cls, orig); | ||
1687 | if (result != 0) | ||
1688 | ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: child attempted but failed to create one or more tables for %s", ap_get_server_name(orig)); | ||
1689 | else | ||
1690 | ap_log_error(APLOG_MARK,NOTICELEVEL,orig->server,"mod_log_sql: no problems creating tables for %s", ap_get_server_name(orig)); | ||
1691 | } | ||
1692 | */ | ||
1693 | |||
1694 | /* It failed, but NOT because table didn't exist */ | ||
1695 | /* | ||
1696 | if ( (result) && (result != ER_NO_SUCH_TABLE) ) | ||
1697 | preserve_entry(orig,access_query); | ||
1698 | */ | ||
1699 | |||
1700 | /* It failed because table didn't exist */ | ||
1701 | /* | ||
1702 | if (result == ER_NO_SUCH_TABLE) | ||
1703 | if (create_tables) { | ||
1704 | ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: access table doesn't exist...creating now"); | ||
1705 | if ((result = safe_create_tables(cls, orig))) { | ||
1706 | ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: child attempted but failed to create one or more tables for %s, preserving query", ap_get_server_name(orig)); | ||
1707 | preserve_entry(orig,access_query); | ||
1708 | } else { | ||
1709 | ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: table(s) successfully created - retrying insert"); | ||
1710 | if ((result = safe_mysql_query(orig, access_query))) { | ||
1711 | ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: giving up, preserving query"); | ||
1712 | preserve_entry(orig,access_query); | ||
1713 | return OK; | ||
1714 | } else | ||
1715 | ap_log_error(APLOG_MARK_ERRLEVEL,orig->server,"mod_log_sql: insert successful after table creation"); | ||
1716 | } | ||
1717 | } else { | ||
1718 | ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: access table doesn't exist...not allowed to create, giving up, preserving query"); | ||
1719 | preserve_entry(orig,access_query); | ||
1720 | return OK; | ||
1721 | } | ||
1722 | */ | ||