[460] in BarnOwl Developers
[D-O-H] r589 - in trunk: . conf.alexmv conf.alexmv/modules conf.alexmv/sql owl/doc
daemon@ATHENA.MIT.EDU (hartmans@MIT.EDU)
Thu Oct 29 18:06:24 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: hartmans@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Date: Thu, 8 Feb 2007 21:31:02 -0500 (EST)
Author: hartmans
Date: 2007-02-08 21:30:59 -0500 (Thu, 08 Feb 2007)
New Revision: 589
Added:
trunk/conf.alexmv/
trunk/conf.alexmv/modules/
trunk/conf.alexmv/modules/owlconf-dbi
trunk/conf.alexmv/sql/
trunk/conf.alexmv/sql/zephyr_log.sql
Removed:
trunk/owl/doc/owlconf-dbi
trunk/owl/doc/zephyr_log.sql
Log:
Move ALex's database stuff into a conf directory.
I don't really think it counts as documentation.
If people disagree with my proposed location we should discuss; I'm just trying to move out of doc
and do not care where it ends up.
Copied: trunk/conf.alexmv/modules/owlconf-dbi (from rev 585, trunk/owl/doc/owlconf-dbi)
===================================================================
--- trunk/conf.alexmv/modules/owlconf-dbi (rev 0)
+++ trunk/conf.alexmv/modules/owlconf-dbi 2007-02-09 02:30:59 UTC (rev 589)
@@ -0,0 +1,31 @@
+sub owl::startup {
+ use DBI;
+ use DateTime;
+ use DateTime::Format::Strptime;
+ $owl::strp = DateTime::Format::Strptime->new(pattern => "%a %b %d %T %Y");
+}
+
+
+sub owl::db_connect {
+ return if $owl::dbh and $owl::dbh->ping;
+ $owl::dbh = DBI->connect("DBI:mysql:database=zephyr_log",
+ "owl", "", {RaiseError => 1});
+ $owl::sth = $owl::dbh->prepare("INSERT INTO messages(sender, class, instance, opcode, sent, received, host, zsig, body) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+}
+
+sub owl::receive_msg {
+ my $msg = shift;
+ return unless $msg->is_zephyr and not $msg->is_personal;
+ my $sent = $owl::strp->parse_datetime($msg->time);
+ owl::db_connect();
+ $owl::sth->execute($msg->sender,
+ $msg->class,
+ $msg->instance,
+ $msg->opcode ? $msg->opcode : undef,
+ $sent->datetime,
+ DateTime->now->datetime,
+ lc $msg->hostname,
+ $msg->zsig,
+ $msg->body,
+ );
+}
Copied: trunk/conf.alexmv/sql/zephyr_log.sql (from rev 585, trunk/owl/doc/zephyr_log.sql)
===================================================================
--- trunk/conf.alexmv/sql/zephyr_log.sql (rev 0)
+++ trunk/conf.alexmv/sql/zephyr_log.sql 2007-02-09 02:30:59 UTC (rev 589)
@@ -0,0 +1,55 @@
+-- MySQL dump 10.10
+--
+-- Host: localhost Database: zephyr_log
+-- ------------------------------------------------------
+-- Server version 5.0.26-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `messages`
+--
+
+DROP TABLE IF EXISTS `messages`;
+CREATE TABLE `messages` (
+ `id` int(11) NOT NULL auto_increment,
+ `sender` varchar(100) NOT NULL default '',
+ `class` varchar(100) NOT NULL default '',
+ `instance` varchar(100) NOT NULL default '',
+ `opcode` varchar(100) default NULL,
+ `sent` timestamp NOT NULL default CURRENT_TIMESTAMP,
+ `received` timestamp NULL default NULL,
+ `host` varchar(200) NOT NULL default '',
+ `zsig` text NOT NULL,
+ `body` text,
+ PRIMARY KEY (`id`),
+ KEY `index_class` (`class`),
+ KEY `index_instance` (`instance`),
+ KEY `index_class_instance` (`class`,`instance`),
+ KEY `index_class_instance_sender` (`class`,`instance`,`sender`),
+ KEY `index_class_sender` (`class`,`sender`),
+ KEY `index_sender` (`sender`),
+ KEY `index_host` (`host`),
+ KEY `index_sent` (`sent`),
+ FULLTEXT KEY `index_body` (`body`)
+) ENGINE=MyISAM AUTO_INCREMENT=1517065 DEFAULT CHARSET=utf8;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2007-02-06 21:39:09
Deleted: trunk/owl/doc/owlconf-dbi
===================================================================
--- trunk/owl/doc/owlconf-dbi 2007-02-08 21:39:41 UTC (rev 588)
+++ trunk/owl/doc/owlconf-dbi 2007-02-09 02:30:59 UTC (rev 589)
@@ -1,31 +0,0 @@
-sub owl::startup {
- use DBI;
- use DateTime;
- use DateTime::Format::Strptime;
- $owl::strp = DateTime::Format::Strptime->new(pattern => "%a %b %d %T %Y");
-}
-
-
-sub owl::db_connect {
- return if $owl::dbh and $owl::dbh->ping;
- $owl::dbh = DBI->connect("DBI:mysql:database=zephyr_log",
- "owl", "", {RaiseError => 1});
- $owl::sth = $owl::dbh->prepare("INSERT INTO messages(sender, class, instance, opcode, sent, received, host, zsig, body) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
-}
-
-sub owl::receive_msg {
- my $msg = shift;
- return unless $msg->is_zephyr and not $msg->is_personal;
- my $sent = $owl::strp->parse_datetime($msg->time);
- owl::db_connect();
- $owl::sth->execute($msg->sender,
- $msg->class,
- $msg->instance,
- $msg->opcode ? $msg->opcode : undef,
- $sent->datetime,
- DateTime->now->datetime,
- lc $msg->hostname,
- $msg->zsig,
- $msg->body,
- );
-}
Deleted: trunk/owl/doc/zephyr_log.sql
===================================================================
--- trunk/owl/doc/zephyr_log.sql 2007-02-08 21:39:41 UTC (rev 588)
+++ trunk/owl/doc/zephyr_log.sql 2007-02-09 02:30:59 UTC (rev 589)
@@ -1,55 +0,0 @@
--- MySQL dump 10.10
---
--- Host: localhost Database: zephyr_log
--- ------------------------------------------------------
--- Server version 5.0.26-log
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `messages`
---
-
-DROP TABLE IF EXISTS `messages`;
-CREATE TABLE `messages` (
- `id` int(11) NOT NULL auto_increment,
- `sender` varchar(100) NOT NULL default '',
- `class` varchar(100) NOT NULL default '',
- `instance` varchar(100) NOT NULL default '',
- `opcode` varchar(100) default NULL,
- `sent` timestamp NOT NULL default CURRENT_TIMESTAMP,
- `received` timestamp NULL default NULL,
- `host` varchar(200) NOT NULL default '',
- `zsig` text NOT NULL,
- `body` text,
- PRIMARY KEY (`id`),
- KEY `index_class` (`class`),
- KEY `index_instance` (`instance`),
- KEY `index_class_instance` (`class`,`instance`),
- KEY `index_class_instance_sender` (`class`,`instance`,`sender`),
- KEY `index_class_sender` (`class`,`sender`),
- KEY `index_sender` (`sender`),
- KEY `index_host` (`host`),
- KEY `index_sent` (`sent`),
- FULLTEXT KEY `index_body` (`body`)
-) ENGINE=MyISAM AUTO_INCREMENT=1517065 DEFAULT CHARSET=utf8;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2007-02-06 21:39:09
