db ke ym

Adhidarma Hadiwinoto
1 parent 32b39897af
Showing 2 changed files with 25 additions and 26 deletions Side-by-side Diff
index.js
ym.js
@@ -11,30 +11,6 @@ var logger = require(&#39;winston&#39;);
 logger.remove(logger.transports.Console);
 logger.add(logger.transports.Console, { timestamp: function() { return (strftime('%F %T'));  }});
  
-var db = require('./db.js');
-db_connection = db.start(config.db.host, config.db.username, config.db.password, config.db.name, logger);
-
-
-function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
-
-    db_connection.query(
-        'INSERT INTO messages SET ?',
-        {
-            transport: 'YAHOO',
-            logger: logger_id,
-            direction: direction,
-            partner: partner,
-            message: message,
-            sentdate: sentdate,
-        },
-
-        function(err) {
-            if (err != null) {
-                logger.error("Error on inserting messages to DB, error: " + err);
-            }
-        }
-    );
-}
  
 var ym = require('./ym');
 var YahooMessenger = ym.start(config, logger);
 var YahooMessenger = require("yahoomessenger");
 var striptags = require('striptags');
+var db = require('./db.js');
+
+function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
+
+    db_connection.query(
+        'INSERT INTO messages SET ?',
+        {
+            transport: 'YAHOO',
+            logger: logger_id,
+            direction: direction,
+            partner: partner,
+            message: message,
+            sentdate: sentdate,
+        },
+
+        function(err) {
+            if (err != null) {
+                logger.error("Error on inserting messages to DB, error: " + err);
+            }
+        }
+    );
+}
  
 function start(config, logger) {
     var oldMessages = [];
@@ -108,7 +130,6 @@ function start(config, logger) {
         var strftime = require('strftime');
         sentdate = strftime('%Y-%m-%d %H:%M:%S', sentdate);
  
-        /*
         insertMessages(
             db_connection,
             data.user_id,
@@ -117,7 +138,6 @@ function start(config, logger) {
             message,
             sentdate
         );
-        */
  
         broadcast(config.yahoomessenger.report_to, '@' + data.sender + ': ' + message, partner);
  
@@ -149,6 +169,9 @@ function start(config, logger) {
         }
     }
  
+    db_connection = db.start(config.db.host, config.db.username, config.db.password, config.db.name, logger);
+
+
     YahooMessenger.newInstance();
     YahooMessenger.on('ready', onReady);
     YahooMessenger.on('loginSuccessful', onLoginSuccesful);
...	...	@@ -11,30 +11,6 @@ var logger = require('winston');
11	11	logger.remove(logger.transports.Console);
12	12	logger.add(logger.transports.Console, { timestamp: function() { return (strftime('%F %T')); }});
13	13
14		-var db = require('./db.js');
15		-db_connection = db.start(config.db.host, config.db.username, config.db.password, config.db.name, logger);
16		-
17		-
18		-function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
19		-
20		- db_connection.query(
21		- 'INSERT INTO messages SET ?',
22		- {
23		- transport: 'YAHOO',
24		- logger: logger_id,
25		- direction: direction,
26		- partner: partner,
27		- message: message,
28		- sentdate: sentdate,
29		- },
30		-
31		- function(err) {
32		- if (err != null) {
33		- logger.error("Error on inserting messages to DB, error: " + err);
34		- }
35		- }
36		- );
37		-}
38	14
39	15	var ym = require('./ym');
40	16	var YahooMessenger = ym.start(config, logger);
1	1	var YahooMessenger = require("yahoomessenger");
2	2	var striptags = require('striptags');
	3	+var db = require('./db.js');
	4	+
	5	+function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
	6	+
	7	+ db_connection.query(
	8	+ 'INSERT INTO messages SET ?',
	9	+ {
	10	+ transport: 'YAHOO',
	11	+ logger: logger_id,
	12	+ direction: direction,
	13	+ partner: partner,
	14	+ message: message,
	15	+ sentdate: sentdate,
	16	+ },
	17	+
	18	+ function(err) {
	19	+ if (err != null) {
	20	+ logger.error("Error on inserting messages to DB, error: " + err);
	21	+ }
	22	+ }
	23	+ );
	24	+}
3	25
4	26	function start(config, logger) {
5	27	var oldMessages = [];
...	...	@@ -108,7 +130,6 @@ function start(config, logger) {
108	130	var strftime = require('strftime');
109	131	sentdate = strftime('%Y-%m-%d %H:%M:%S', sentdate);
110	132
111		- /*
112	133	insertMessages(
113	134	db_connection,
114	135	data.user_id,
...	...	@@ -117,7 +138,6 @@ function start(config, logger) {
117	138	message,
118	139	sentdate
119	140	);
120		- */
121	141
122	142	broadcast(config.yahoomessenger.report_to, '@' + data.sender + ': ' + message, partner);
123	143
...	...	@@ -149,6 +169,9 @@ function start(config, logger) {
149	169	}
150	170	}
151	171
	172	+ db_connection = db.start(config.db.host, config.db.username, config.db.password, config.db.name, logger);
	173	+
	174	+
152	175	YahooMessenger.newInstance();
153	176	YahooMessenger.on('ready', onReady);
154	177	YahooMessenger.on('loginSuccessful', onLoginSuccesful);