NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'master' of github.com:Pita/etherpad-lite

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-11-18 13:56:30 -08:00
commit 673d2c028b
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -82,6 +82,8 @@ Here is the **[FAQ](https://github.com/Pita/etherpad-lite/wiki/FAQ)**
## Next Steps ## Next Steps
You can modify the settings in the file `settings.json` You can modify the settings in the file `settings.json`
You should use a dedicated database such as "mysql" if you are planning on using etherpad-lite in a production environment, the "dirty" database driver is only for testing and/or development purposes.
You can update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies You can update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies
Look at this wiki pages: Look at this wiki pages:

5
node/server.js
View file

@ -91,7 +91,10 @@ async.waterfall([
var httpLogger = log4js.getLogger("http"); var httpLogger = log4js.getLogger("http");
app.configure(function() app.configure(function()
{ {
app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158.
// Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR"))
app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
app.use(express.cookieParser()); app.use(express.cookieParser());
}); });

3
settings.json.template
View file

@ -8,7 +8,8 @@
"ip": "0.0.0.0", "ip": "0.0.0.0",
"port" : 9001, "port" : 9001,
//The Type of the database. You can choose between sqlite and mysql //The Type of the database. You can choose between dirty, sqlite and mysql
//You should use mysql or sqlite for anything else than testing or development
"dbType" : "dirty", "dbType" : "dirty",
//the database specific settings //the database specific settings
"dbSettings" : { "dbSettings" : {

15
static/js/pad2.js
View file

@ -79,12 +79,13 @@ function randomString()
function getParams() function getParams()
{ {
var showControls = getUrlVars()["showControls"]; var params = getUrlVars()
var showChat = getUrlVars()["showChat"]; var showControls = params["showControls"];
var userName = unescape(getUrlVars()["userName"]); var showChat = params["showChat"];
var showLineNumbers = getUrlVars()["showLineNumbers"]; var userName = params["userName"];
var useMonospaceFont = getUrlVars()["useMonospaceFont"]; var showLineNumbers = params["showLineNumbers"];
var IsnoColors = getUrlVars()["noColors"]; var useMonospaceFont = params["useMonospaceFont"];
var IsnoColors = params["noColors"];
if(IsnoColors) if(IsnoColors)
{ {
@ -130,7 +131,7 @@ function getParams()
if(userName) if(userName)
{ {
// If the username is set as a parameter we should set a global value that we can call once we have initiated the pad. // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
globalUserName = userName; globalUserName = unescape(userName);
} }
} }