seperate some modules from model.lua.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>

src/bin/bamboo_handler

@@ -67,6 +67,22 @@ _G['View'] = require 'bamboo.view'
 _G['Form'] = require 'bamboo.form'
 _G['Model'] = require 'bamboo.model'
 _G['Session'] = require 'bamboo.session'
+
+
+
+config.config_file = config.config_file or "config.lua"
+if config.monserver_dir then
+	-- format full directory of config_file, to find mongrel2's configuration
+	config.config_file = config.monserver_dir + '/' + config.config_file
+end
+config.route = config.route or '/'
+
+local m2 = require 'bamboo.m2'
+m2.loadConfig(config)
+-- make a connection as the pipe interact with mongrel2
+local conn = assert(m2.connect(config), "Failed to connect to monserver. ")
+bamboo.conn = conn
+
 local Web = require 'bamboo.web'
 
 ------------------------------------------------------------------------
@@ -126,11 +142,12 @@ local MappingTableConcrete, MappingTablePattern = makeUrlHandlerMapping(URLS)
 bamboo.URLS = MappingTableConcrete
 bamboo.PATTERN_URLS = MappingTablePattern
 
+if not config.PRODUCTION then
 print('-------------------- URL Settings --------------------')
 ptable(MappingTableConcrete)
 ptable(MappingTablePattern)
 print('------------------------------------------------------')
-
+end
 ------------------------------------------------------------------------
 -- find handler function by path
 -- @param path:	coming path
@@ -379,7 +396,7 @@ local function run(conn, config)
     print('Bamboo main loop aborted!')
 end
 
-local m2 = require 'bamboo.m2'
+
 
 local function collectConfig(config)
 
@@ -426,10 +443,6 @@ end
 -- @return:			none
 ------------------------------------------------------------------------
 local function start(config)
-	-- load sqlite3 configuration, update to config table
-    m2.loadConfig(config)
-	-- make a connection as the pipe interact with mongrel2
-    local conn = assert(m2.connect(config), "Failed to connect to monserver. ")
 
     -- boot main loop
     run(conn, config)

src/bin/shell.lua

@@ -7,6 +7,7 @@ local util = require 'bamboo.util'
 -- load configuration
 local config = util.readSettings(bamboo.config)
 ptable(config)
+config.is_shell = true
 
 local DB_HOST = config.DB_HOST or arg[1] or '127.0.0.1'
 local DB_PORT = config.DB_PORT or arg[2] or '6379'
@@ -22,3 +23,4 @@ setfenv(assert(loadfile('app/handler_entry.lua') or loadfile('../app/handler_ent
 
 print('Entering bamboo shell.... OK')
 return true
+