Commit Graph

247 Commits (98993fe15620f50d454c85597116dbd1c90fd044)

Author SHA1 Message Date
Reed A. Cartwright 843b05a6ec Use exec to switch to node process
At the end of run, `exec` should be used to switch to the node process.  That way node will take over the pid of `sh run.sh`, making it easier to monitor and daemonize the server. 

```
    exec [command [arg ...]]
             Unless command is omitted, the shell process is replaced with the
             specified program (which must be a real program, not a shell
             built-in command or function).  Any redirections on the exec com-
             mand are marked as permanent, so that they are not undone when
             the exec command finishes.
```
2016-01-19 16:17:16 -07:00
Blake Tölva c61aa20028 Improve DB migration performance.
Achieve 10x speedup in migrating a 12mb dirtyDB file by disabling
ueberDB caching in this special case.  Add some progress messages
to the migration script and rename it, as nothing in it is tied
to mysql.
2015-11-21 23:15:46 -08:00
Komasa 5f9d1397e2 Update installDeps.sh 2015-11-04 21:15:13 +01:00
John McLear 02f88aafff Update installOnWindows.bat 2015-10-22 16:22:35 +01:00
John McLear fa46f0b613 Merge pull request #2797 from ypid/rebuild-better-error
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-22 16:15:27 +01:00
Robin Schneider c9924ee706
Give better error message when rebuildPad.js hits a non-existing rev. 2015-10-07 12:42:19 +02:00
Stefan bf7930fccb Support version 4 of node.js 2015-09-26 12:15:54 +02:00
István Király 376fccfe92 bugfix for correct bash syntax
$rocks has to be enclosed into a "string" so bash can treat is as a string.
We can compare two strings with the == operator then, ...
2015-06-22 16:11:29 +02:00
Hinnerk Haardt 7ba5e97a60 Use current mysql client API 2015-05-30 15:14:40 +02:00
John McLear e1406b826b cleaner update logic doesnt error when nothing to do 2015-04-26 14:42:21 +01:00
John McLear a6a8c4d909 provide a script that cleans up before running to save people doing rm rf src node_modules 2015-04-24 07:07:18 +01:00
John McLear 70d338c7d5 Merge pull request #2618 from Gared/win_node_version
Update node version for windows build to 0.12.2
2015-04-16 21:58:13 +01:00
Stefan f81c6b6476 Update node version for windows build to 0.12.2 2015-04-16 22:56:14 +02:00
John McLear a3ce6b1ca7 remove two pointless dep removes 2015-04-15 15:51:13 +01:00
Tom Hunkapiller 4385598de6 update node version checking to 0.10+ or io.js 2015-04-08 23:12:12 -05:00
Tom Hunkapiller 63cbab484d express dropped support for node 0.8; update engine requirements 2015-04-08 23:12:11 -05:00
Raphaël Dubigny 119fc82387 Update installDeps.sh 2015-04-04 17:30:41 +02:00
Raphaël Dubigny dfd17d1aba Update installDeps.sh 2015-04-04 17:14:59 +02:00
LeoVerto 7e9bc1b7b9 Fix minor typo in safeRun.sh email report 2015-03-31 18:33:47 +02:00
Stefan 0505a47356 Support node version 0.12.x 2015-02-15 22:21:41 +01:00
John McLear f880b0feb7 clean up iojs 2015-01-21 12:18:38 +00:00
nemetz 648ebc08d6 check for io.js
Added a check for io.js
2015-01-16 11:11:34 -02:00
Jan-Erik Rediger 1f558dc843 Removed useless use of cat 2015-01-08 14:16:07 +01:00
John McLear 80fa2c2868 move docs 2014-12-24 02:45:21 +00:00
John McLear 1ab7dfdb7b Merge pull request #2358 from BjarniRunar/develop
Created dirty-db-cleaner.py - prunes old history from dirty.db files
2014-12-23 15:50:59 +00:00
John McLear ffdce760d5 remove unused long paths from windows build 2014-12-21 22:05:07 +00:00
John McLear 89adbb9f12 Merge pull request #2329 from timrchavez/rebuild-pad-script
Restore pad to new location at a given revision
2014-12-04 02:34:21 +00:00
Timothy Chavez c7b1aebfe8 Make changes based on code review
Simplified the cloning process, added validation checks to ensure the
new pad ID is valid and that a pad doesn't already exist with that ID.
Also fixed a bug in the chatHead cloning loop and added the ability to
specify a pad ID on the command the line (defaulting to the original
"-rebuilt" pad ID formula)
2014-12-03 20:11:39 -06:00
Bjarni R. Einarsson 9c174023fc Added dirty-db-cleaner.py 2014-12-01 22:39:42 +00:00
John McLear c6d7ed114e script to update all plugins with one command on CLI 2014-11-28 16:27:12 +00:00
John McLear 5434d2118d tidy up and re-organize 2014-11-26 19:28:49 +00:00
John McLear 88b3d99fbd Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests 2014-11-26 15:33:13 +00:00
John McLear 0a84379364 make additional line break at end of imported doc 2014-11-26 15:19:22 +00:00
John McLear 3ac833d455 basic test runner 2014-11-25 22:47:22 +00:00
John McLear 97068b562d more old load testing cruft 2014-11-25 01:22:32 +00:00
John McLear 5e843a5877 remove jshint 2014-11-25 01:21:19 +00:00
Timothy Chavez 25ccb6cfc3 Simplify the rebuild process
The majority of the information needed to build the new pad can be
communicated by simply cloning the rev using a db.set().
2014-11-20 22:09:21 -06:00
Timothy Chavez 01f6d85371 Restore pad to new location at a given revision
This script gives an admin with shell access the ability to restore a
pad at a given revision by essentially rebuilding it at a new location
with data associated with the original pad.  The upsides to creating a
new pad vs. changing the original are: 1) avoiding service disruptions
(no deletes, no moving targets - builds from previous revision); and 2)
preservation of data (no deletes, no overwriting of the source pad).
The most obvious downside is the pad has a new ID which could require
folks to update their links, bookmarks, etc. to point at the new
location.
2014-11-19 13:09:37 -06:00
Stefan 94968e69be Add support for npm 2 2014-09-27 12:30:11 +02:00
Gared ab607d3137 Add a script to reinsert all db values of a pad 2014-05-19 18:18:01 +02:00
Luc Didry 3d8452b143 Replace tabs indentation with spaces indentation
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear 8c1e066a02 mkdir 2013-11-24 13:13:29 +00:00
John McLear 97f5b581b0 cp readme on build 2013-11-24 13:08:26 +00:00
John McLear 1eef5278bd growwlll 2013-11-24 12:51:50 +00:00
John McLear 6ee57746c9 whoopsi 2013-11-24 12:44:09 +00:00
John McLear d6f1aa3236 clean 2013-11-24 12:41:12 +00:00
John McLear 678c80d1dc whoa there, no need to include .git folder in build 2013-11-24 02:57:15 +00:00
John McLear 09429be4c9 whoops 2013-11-24 02:52:55 +00:00
John McLear 61df1facd2 semi-working build script for deb packages 2013-11-24 02:42:50 +00:00
John McLear 1f68f07083 support node 0.11 2013-11-14 22:46:58 +00:00
John McLear fa4ebd602c Update installDeps.sh 2013-11-12 09:58:22 +00:00
John McLear 932c9ae406 allow nix file process path to be visible in ps aux 2013-11-10 16:32:33 +00:00
Eric Schrijver b34224559d ‘Etherpad Lite’ -> ‘Etherpad’ 2013-09-29 13:57:37 +02:00
Michael Parks f3987007b0 Back to sh, fix comparison for POSIX/dash (++ CentOS, Ubuntu compatibility) 2013-09-17 15:27:52 -06:00
Michael Parks dc2418e532 Start script needs bash instead of sh for root arguments 2013-08-15 11:06:48 -06:00
Chia-liang Kao 67b513216a Fix safeRun that tries to shift on subsequent restarts 2013-05-29 10:40:30 +08:00
Jens Herrmann cbbf9a82ac Pass arguments from safeRun.sh to run.sh 2013-05-26 23:06:15 +02:00
Marcel Klehr 782c512e93 Drop support for node v0.6, officially 2013-04-01 14:07:38 +02:00
John McLear e050ad57e4 fix typo 2013-03-22 17:39:22 +00:00
Marcel Klehr 5a9393d5da Update version checks 2013-03-16 09:46:35 +01:00
CeBe 62c13b4c3f typo 2013-03-07 14:10:54 +01:00
CeBe 70c329957d additional ouput for importSqlFile 2013-03-07 14:05:55 +01:00
CeBe 4026ba1815 fixed saved data to be escaped properly 2013-03-07 13:15:29 +01:00
CeBe f2b173f566 improved output for importSqlFile 2013-03-06 22:38:18 +01:00
CeBe 76fbc29607 improved output for importSqlFile 2013-03-06 22:36:00 +01:00
CeBe 4b7238c2cd improved output for importSqlFile 2013-03-06 22:28:00 +01:00
CeBe db0d0d1f72 fixed problem with npm 2013-03-06 22:08:14 +01:00
CeBe 6dfc5f2c88 a script that allows importing old etherpad db
this script allows you to import the sql file generated with
convert.js into all supported dbms, not only MySQL
2013-03-06 21:24:19 +01:00
Marcel Klehr af25606ea8 Fix bin/extractPadData on windows 2013-02-27 16:26:22 +01:00
John McLear ea4307ae97 remove console error 2013-02-26 16:32:34 -08:00
John McLear 1fd99bfd43 fix deletePad script by remembering not to miss a callback.. 2013-02-26 16:32:09 -08:00
John McLear b7d96b1dcf a cli tool for deleting pads 2013-02-26 11:44:22 +00:00
John McLear 0a19589509 fix path for windows 2013-02-18 20:40:34 +00:00
John McLear 19964498f3 no need to parse already parsed json 2013-02-18 20:38:32 +00:00
John McLear f76cfad42b remove cruft 2013-02-18 08:30:42 -08:00
John McLear 4cfac2f624 fix extract and checkPad 2013-02-18 08:29:25 -08:00
John McLear bf6958ad57 Update bin/loadTesting/README 2013-02-12 15:04:06 +00:00
John McLear 6aeed1268e change message 2013-02-10 15:19:28 +00:00
John McLear 3a73aa2f48 please wait msg 2013-02-10 03:17:04 +00:00
Manuel Knitza 98a9b1e222 update jquery 1.7.1 -> 1.9.1 2013-02-10 02:55:50 +01:00
Manuel Knitza 7066ed183d Update bin/convert.js
'lil typo
2013-01-22 00:56:39 +01:00
Marcel Klehr 90ca3d53c3 Fix #1367: async.series was lacking callback in checkPad.js 2013-01-17 17:31:56 +01:00
mluto 7db6448e2a Load npm before everything else in checkPad.js 2013-01-15 07:31:51 +01:00
John McLear 025c92f346 Merge pull request #1328 from mluto/run-sh-root-argument
Added --root argument to run.sh to bypass the root-check, fix for #1324
2013-01-14 08:14:13 -08:00
Marcel Klehr f4b95c5ca4 Add log4js config setting 2013-01-13 12:20:49 +01:00
mluto e7d9359737 Added error-handling for npm 2013-01-06 20:20:46 +01:00
mluto 7ec7ccc402 Fixed extractPadData.js, #1320 2013-01-06 19:25:32 +01:00
mluto 6a27a54727 Added --root argument to run.sh to bypass the root-check, fix for #1324 2013-01-06 12:48:32 +01:00
Hyacinthe Cartiaux d6027726e6
Fix urls, use github.com/ether
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
Marcel Klehr b515156041 Only show errors/warnings on npm install [windows] 2012-11-19 15:24:48 +01:00
Marcel Klehr 3e53a11127 Show errors on npm install 2012-11-19 15:19:59 +01:00
johnyma22 cefbd8354d fix tiny error of missing space 2012-11-16 21:12:04 +00:00
johnyma22 fbe16da728 dont forget to allow for cleanup 2012-11-16 20:52:19 +00:00
johnyma22 27c5e8691f mheh, better way of handling the buidl for windows script 2012-11-16 20:51:08 +00:00
johnyma22 1321d9e16f Resolve #1171 by not including tests in windows build 2012-11-16 20:17:25 +00:00
John McLear bad9b2ee66 Merge pull request #1162 from ether/windows-build-script-exclusions
Dont include git history in the windows .zip
2012-11-15 08:10:30 -08:00
Marcel Klehr fcee203a1a Dont include git history in the windows .zip
git history is located in .git/objects
2012-11-15 15:16:12 +01:00
John McLear 3821c1441c Merge pull request #1150 from marcelklehr/fix/script-migrate-dirty-mysql
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
2012-11-14 10:40:11 -08:00
Peter 'Pita' Martischka 4c095202bd Merged branch feature/frontend-tests 2012-11-13 07:29:57 -08:00
Marcel Klehr b057759eae Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
npm must be npm.load'ed before using it
2012-11-09 22:06:26 +01:00