5078b8bf11f23b1f4e42c701438c37c6140fd93e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9191176c4c189bb793688dcce1f6075182c6ecc0 9191176c4c189bb793688dcce1f6075182c6ecc0 2008-10-29T13:30:01-07:00 2008-10-29T13:27:37-07:00 Removes merb-core de52a19262c08e7dbd41ebb6d0c08a489f0c5732 Yehuda Katz wycats@gmail.com 20fd63f05d75d10f8a6afc54c2295da259d89f78 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 2008-10-11T21:24:54-07:00 2008-10-11T21:24:54-07:00 Since intention/option comment behind workers respawn in -k are not clear, do not let killing master with -k for now. db5f0e921e84d1d7d1bab1c5ba09f373823f7943 Michael S. Klishin michael@novemberain.com b808cb9afb2165e6ecb0d7ccf0833421593179f7 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/62875e042425f7eac39c1d9220ba9085ddb2a293 62875e042425f7eac39c1d9220ba9085ddb2a293 2008-10-10T10:54:14-07:00 2008-10-09T13:48:01-07:00 docs for config.rb 060263ca9564f7de0dc3aed16f18c821a0c6d775 Drew Colthorp colthorp@atomicobject.com 5046fc439e185c480fa3d9b76bf55d8936657bfd Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/933b34305130c2c249df07a7c41ab24b477af9ae 933b34305130c2c249df07a7c41ab24b477af9ae 2008-10-10T10:54:13-07:00 2008-10-09T10:59:03-07:00 Check whether to use forking a tad better. da41644e95498722a06fcb58eefb728721595fde Drew Colthorp colthorp@atomicobject.com 4c4f24ad393999037e34e5f0791674217c6862dd Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/5a10f1840c3af5e1ddfc5895b85512d649541ffa 5a10f1840c3af5e1ddfc5895b85512d649541ffa 2008-10-07T05:06:24-07:00 2008-10-07T04:26:07-07:00 Use new logger options log_stream/log_file the same way everywhere. dbdbd644d6a3826d599cbb0554f4c0f54bcfeb55 Michael S. Klishin michael@novemberain.com 74f9ff6afe34fbcff2dc7b271afc9a359ff2e999 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/5e8e046219cb7dfebc423536cd401d8f2bfc554f 5e8e046219cb7dfebc423536cd401d8f2bfc554f 2008-10-04T06:19:13-07:00 2008-10-04T06:19:13-07:00 Added process title reporting as per: LH #517 http://merb.lighthouseapp.com/projects/7433-merb-core/tickets/517-process-reporting#ticket-517-4 cc5c59ba632474b66501fd8abe8282e36f4fb2e7 Wayne E. Seguin wayneeseguin@gmail.com 17152c0f717f2451f15cdb8c2d2bc8bffa1858a5 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/5110677bfd417cc7931d0de8a4bb286c92531eea 5110677bfd417cc7931d0de8a4bb286c92531eea 2008-10-02T12:12:42-07:00 2008-10-02T12:12:42-07:00 If --log-level or --log is explicitly given, never log to STDOUT, alsways to file 93f499d085081a7cdbd9c700294b50ad945808ba Fabien Franzen info@atelierfabien.be f3ac3ecfc8fc718e95920b0053eeed546ebcf79d Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/0ac860413522aa030cb347bfe4ba5021035adf6d 0ac860413522aa030cb347bfe4ba5021035adf6d 2008-10-01T14:43:57-07:00 2008-10-01T14:43:57-07:00 Make Merb::Config[]= work without calling setup 1st c75eda59577735cd97573a70d52c016021889acb Fabien Franzen info@atelierfabien.be 0f4957f2e03ba79eb914563507b0582738fb5d37 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a6f6a986ab3aa1414368d24892a808c448ecb564 a6f6a986ab3aa1414368d24892a808c448ecb564 2008-09-27T23:06:08-07:00 2008-09-27T23:06:08-07:00 Merge in forking branch. * Merb starts with master and worker processes now. * Logger is now 100% thread safe and works on current JRuby. * New options for fast redeploy/restart of cluster. * Reloading machinery should be bullet proof now. Squashed commit of the following: commit 4405ac5db172a40d533b71a0a57a3233aea13435 Author: Yehuda Katz <wycats@gmail.com> Date: Sun Sep 28 01:24:39 2008 -0400 Add --fast-deploy option commit 247779ebe96100b49690581801a897636e72b36a Author: Yehuda Katz <wycats@gmail.com> Date: Sun Sep 28 01:19:39 2008 -0400 Operator precedence ftl commit 55dcdc6fbc29257dcaf25997d59cdf66fb66a507 Author: Yehuda Katz <wycats@gmail.com> Date: Sun Sep 28 00:31:53 2008 -0400 Somehow the code that supports a single log file went missing :P commit afc291cd9d5c660c4071741b21e79a3df62223f2 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 27 16:23:28 2008 -0400 Tests pass: we don't need to fork for class load in test env, plus update config spec for some small changes to the internal API commit 67e1756c267edb27f0229e0e7f9883736868742a Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 27 16:14:16 2008 -0400 get merb -k and merb -K to work (with and without `all') commit eb52fcec508a458af4d2d286223960b24a2954c3 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 27 16:13:48 2008 -0400 Fix bug with creating a new log commit 70a47b4b70c67a0328f1845fab0f9ef258a1ec87 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:58:28 2008 -0700 Reload spec needs to be added back later; logger specs work again after removing mocks and modifying specs for public API changes commit fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:38:57 2008 -0700 Fix logger helper commit d22b8e6c60b48718e7484a1154a2211c5fa17404 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 22:12:14 2008 -0700 Attempt threadsafe logger commit 205f2436a741841abc92901c015f3c470a5b99b7 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:57:07 2008 -0700 Hide the backtrace for Mongrel timeout errors. commit 27779e1f857c3555c87451a1011bbeee646fa1f5 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:22:17 2008 -0700 Respawn processes killed with kill -9 commit f4fd0d39ea76e1722ee115f15f307732603d7ce4 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:18:02 2008 -0700 Tons of comments; support for various forking configurations commit acb90a6e57e075717a235f5896df545937880416 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 22:32:13 2008 -0700 Forking setup works without any forking. commit ab4f142a2433452c940696d2f6bd9e23e375ea20 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:59:58 2008 -0700 Update thin for new stop() API commit e5937d5a6a08d29fcf0d40b3eb6e18a6dc7191a7 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:58:35 2008 -0700 Added better errors for failures originating with Merb commit 04e2a9b4e7e997613d0f712d4d79612304066808 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:57:20 2008 -0700 Checked in experiments (for posterity) commit 7e8385254168c99e39208fbadbdb4758c9f52b92 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 13:16:56 2008 -0700 All Ruby-based servers work now with forking; NEXT: Make forking only happen when appropriate commit abe9f500695154adc0da4535652ef8a070435875 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 01:35:33 2008 -0700 Help REE make better use of GC commit 388941a35c0454153f0e80ae9ec9deb44c5d2252 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 23:47:13 2008 -0700 Ebb works commit a5b48f4ba2ac499a020d748466f8cba2a8223fb6 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 22:26:07 2008 -0700 Someone should figure out why I had to make the change I needed to in config.rb; abstract up the API for making a new forkable process; thin-turbo appears to have some issues commit 6e2a107c4bec7281ff944b92dd426f1c47137663 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 12:10:55 2008 -0700 Fix some more issues relating to graceful exits; remove pids on exit; TODO: merb -k must work commit 717d5a8667a1fc206061c007e00528643676fb5e Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 00:05:26 2008 -0700 Tighten things up so that ctrl-c works correctly commit 76eba224d0beed7a32a2e20826f0f0574a4e20c9 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 21:18:20 2008 -0700 Reload works again commit ca5d6b2a3df884a074d289a41eeb56f540849686 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 18:32:55 2008 -0700 Finish up making mongrel handle everything correctly. We need to update merb -k to use the new signals. commit 9ec4de2155eab3f398138889584f3dfd25d226c2 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 10:16:04 2008 -0700 More forking support commit ec7cfae89c157333a3df6c57a9b1987caf51f7e4 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 20 00:52:47 2008 -0500 Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4 commit aceea3838234535573aa02c2d914d65c11a1ceb5 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 18:47:09 2008 -0500 Split out the code transaction into a method and do some experimentation with cluster forking. commit 56e09f16c302126864c72adf9ecbdf992b29c8a3 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:43:39 2008 -0700 Better exit message commit 2b67c34ac05de5c48260baa9a6f0d95f70101ab4 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:10:19 2008 -0700 Initial support for fast redeploys and code reloading via forks. commit b7e9fc3e9f08c7970d1b6d69928e832511c7f2fe Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:58:28 2008 -0700 Reload spec needs to be added back later; logger specs work again after removing mocks and modifying specs for public API changes commit bdf5c2d82d7420f4604e48f60e69e2d2f037858a Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:38:57 2008 -0700 Fix logger helper commit 8b09d459156158673d174a2d86cc32bf5175049c Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 22:12:14 2008 -0700 Attempt threadsafe logger commit b3b0eb25e3037031a34588683be8e6d6c8db621c Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:57:07 2008 -0700 Hide the backtrace for Mongrel timeout errors. commit 315d89c21f13b32c6db4d58ce945be361061ca6f Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:22:17 2008 -0700 Respawn processes killed with kill -9 commit a7ba4dbb14aa0a3e6a56757713f18820b241c982 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:18:02 2008 -0700 Tons of comments; support for various forking configurations commit 093d38fcb65f67ac44e786e266475c88f7c16d38 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 22:32:13 2008 -0700 Forking setup works without any forking. commit 9e4d8c861806c782b99b00bcbc98ee1223113fc7 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:59:58 2008 -0700 Update thin for new stop() API commit 7c376ee3dd3e797026b5e0917a58c897d8a623f5 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:58:35 2008 -0700 Added better errors for failures originating with Merb commit 0ea49649648e307f7289edee928a8485ba96f75f Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:57:20 2008 -0700 Checked in experiments (for posterity) commit da7611a85255b5fb80e728bb7af48dfba8ff44d0 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 13:16:56 2008 -0700 All Ruby-based servers work now with forking; NEXT: Make forking only happen when appropriate commit 5cd1901d7edd8cc98a2b83da45b4a85ff741f0e8 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 01:35:33 2008 -0700 Help REE make better use of GC commit 291c3127375786fd64d0808327670d702157f30c Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 23:47:13 2008 -0700 Ebb works commit 956782efc0ab3877eb0161c0b9140fb118db4d4d Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 22:26:07 2008 -0700 Someone should figure out why I had to make the change I needed to in config.rb; abstract up the API for making a new forkable process; thin-turbo appears to have some issues commit 099dc18ff81094a707790e99a922504e661aeba0 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 12:10:55 2008 -0700 Fix some more issues relating to graceful exits; remove pids on exit; TODO: merb -k must work commit d209193a88ab5d522213e4f1747942e1b04b21f3 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 00:05:26 2008 -0700 Tighten things up so that ctrl-c works correctly commit bd10fe6dfcd197b602474f9afd6075db337fb005 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 21:18:20 2008 -0700 Reload works again commit 6c2ebcc54a48ac0ef678ac544ebe22858ed5029c Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 18:32:55 2008 -0700 Finish up making mongrel handle everything correctly. We need to update merb -k to use the new signals. commit 412c4c163dfa363a7c64e047ec4e54c1b61832a4 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 10:16:04 2008 -0700 More forking support commit 94c5eb8d213b107b1c82314cb972649226629376 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 20 00:52:47 2008 -0500 Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4 commit 9a57de6ab3253280b90e3e4bf9dc49b1b2a51c61 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 18:47:09 2008 -0500 Split out the code transaction into a method and do some experimentation with cluster forking. commit 71306ed36084efcafcb51f07bb426509f9fafe4a Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:43:39 2008 -0700 Better exit message commit b7dac300dc08fc8d89e1e2344c4ec77a5e0ad5b6 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:10:19 2008 -0700 Initial support for fast redeploys and code reloading via forks. bd147d0913731b6aaffcc209d49c8d1c3d6fd355 Michael S. Klishin michael@novemberain.com 2d3f9ed9fc5cd27b290ea203741b2fc90e78a247 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/1a72840a46a7da40b342fcc1fe20771c398d4bc1 1a72840a46a7da40b342fcc1fe20771c398d4bc1 2008-09-17T16:06:33-07:00 2008-09-07T16:49:54-07:00 added flag for an IRB trap Signed-off-by: Michael S. Klishin <michael@novemberain.com> 526aaf5be4907f3c930a17f7c790fc10b60bdefb Michael S. Klishin michael@novemberain.com df02637ae3194b193849dd8e07bfa83cf25e550f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4b017a7df0586e4eb615142b62c303b9adb92a72 4b017a7df0586e4eb615142b62c303b9adb92a72 2008-09-13T16:17:34-07:00 2008-09-13T16:17:34-07:00 Merb::Release is gone. c63377909722d6858b32d395125d6389ae1332f6 Michael S. Klishin michael@novemberain.com 06e97c30bb03d802c0ca7b7e5d41127bc4982449 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/78b96e43f8f85d3e3381a72afde92fbc9d284bf3 78b96e43f8f85d3e3381a72afde92fbc9d284bf3 2008-09-12T15:30:42-07:00 2008-09-12T15:30:42-07:00 Removed MerbScriptHelper - simplified loading bundled gems - see merb.thor e783a1f7494df15055498c29cf5d430b2c143157 Fabien Franzen info@atelierfabien.be 2369da6c785948026e4c90a1e53ad2f485ee8c21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b38a93c8abf4a65211596e9543bf1354a06bc4e0 b38a93c8abf4a65211596e9543bf1354a06bc4e0 2008-09-07T10:00:41-07:00 2008-09-07T10:00:41-07:00 Merged in new bundling (aka freezer) branch 452b368f04956c0cabf318f8ab77612f5534b8c2 Fabien Franzen info@atelierfabien.be 3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/2369da6c785948026e4c90a1e53ad2f485ee8c21 2369da6c785948026e4c90a1e53ad2f485ee8c21 2008-09-07T09:41:29-07:00 2008-09-07T09:41:29-07:00 Merged in new-sessions branch 152b17c6ff74bb11542e5068873e4e8e28224944 Fabien Franzen info@atelierfabien.be bed47729b87b59bdb15f1a87c61e31d260708356 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/4dd150273c98310043aa2074e800611cc5eae459 4dd150273c98310043aa2074e800611cc5eae459 2008-08-19T23:24:11-07:00 2008-08-19T23:14:38-07:00 Fixes up a bunch of specs aa14f4a6dbabc78aa98b5896df7eae826c486358 Yehuda Katz wycats@gmail.com 047a5fe76be7525750b605364c02139f04505b27 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c63375986e5111b00cd66c9dc608f216d5069d15 c63375986e5111b00cd66c9dc608f216d5069d15 2008-07-20T11:01:15-07:00 2008-07-20T11:01:15-07:00 Use :info as default log level for now: people wonder "where the output is gone". bc052da325e0817f97c5d465a39f9ee0335ba05d Michael S. Klishin michael@novemberain.com bf37243fc8aa4eee1cc41f2504f3261f4dc03b46 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/047a5fe76be7525750b605364c02139f04505b27 047a5fe76be7525750b605364c02139f04505b27 2008-07-20T10:02:31-07:00 2008-07-20T10:02:31-07:00 Make sure default config has log level of error so template inlining bootloader won't dump everything to the tty. ce4a512ad69390be1b59d5cd991dea3ccb8de24f Michael S. Klishin michael@novemberain.com 522e920c75f927bec7b4d7afcd1bca4b7c097987 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/4d93d323203a323365e7ae915c73b5f2bc107796 4d93d323203a323365e7ae915c73b5f2bc107796 2008-07-05T11:12:02-07:00 2008-07-05T11:12:02-07:00 Added socket option to thin.rb and to the command line options. 02f76029e9bb50b8f4e4eea0e1e019c4541dcaa2 Wayne E. Seguin wayneeseguin@gmail.com 0ff80a0797da59e2a76e9d3dce6bfda886293232 ae6effc91589d45b9ab4e34e17b37af844cf431d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/c763f6fb045bbbf44a0a7552a26468fac8dc3034 c763f6fb045bbbf44a0a7552a26468fac8dc3034 2008-05-12T17:39:42-07:00 2008-05-12T17:39:42-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 291838e203a282320cb8b4aa49bcdb7c50fadd85 Ezra Zygmuntowicz ez@engineyard.com b38c164be5ebda892ac73e9792b6a099f25270cf Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/0ff80a0797da59e2a76e9d3dce6bfda886293232 0ff80a0797da59e2a76e9d3dce6bfda886293232 2008-05-12T17:39:34-07:00 2008-05-12T17:39:34-07:00 remove :nodoc: from merb-core DO NOT USE :nodoc: EVAR!! dd1066ee117b443b19b05e3419cc375fd9c002e4 Ezra Zygmuntowicz ez@engineyard.com bc1a1b78bace56503c8a567bdc1dfe6e9a14edbe Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/304e19d16f0d12e9fc69c1435904342555b1382d 304e19d16f0d12e9fc69c1435904342555b1382d 2008-05-12T07:06:04-07:00 2008-05-12T07:06:04-07:00 Add -V/--verbose options. 88f6f4fdc11024377b48a8e44e82893adc0bc90b Michael S. Klishin michael@novemberain.com 4b7318104e94b7b404fff4140e2bf2e94b53a278 Gabe gabrielh@gmail.com http://github.com/wycats/merb-core/commit/ae200b7dbe4ad5e1629617f99a16c94d3acd10bf ae200b7dbe4ad5e1629617f99a16c94d3acd10bf 2008-05-03T00:48:42-07:00 2008-05-01T09:24:44-07:00 Provide opts for alternate rackup config path. This is consistent with --rackup option for thin and gives a little more freedom to specify the rackup config (instead of being forced to rack.rb). Signed-off-by: Michael S. Klishin <michael@novemberain.com> 3aaa26727ef3c91d01f3a02ba0f8c94e33646709 Michael S. Klishin michael@novemberain.com b2867ec377b6beac376029044be779c75fb92201 Jaroslaw Zabiello hipertracker@gmail.com http://github.com/wycats/merb-core/commit/c432669d4d96bef8d0cef1b0f3abcbff3af1ac0d c432669d4d96bef8d0cef1b0f3abcbff3af1ac0d 2008-05-01T23:10:42-07:00 2008-03-26T04:45:06-07:00 Adding missing info about ebb adapter. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 7f6905b452086303f34107f295a96e4a8eee246b Michael S. Klishin michael@novemberain.com 4771840b2384db0adee1bb06b99caedcb957c5c4 Gabe gabrielh@gmail.com http://github.com/wycats/merb-core/commit/5a4589f5c174f3d5d979ece83476588f478e6cce 5a4589f5c174f3d5d979ece83476588f478e6cce 2008-04-29T14:35:35-07:00 2008-04-29T14:35:35-07:00 Fix for kill so that cli options are read and handled before kill is actually called. Need this to handle kill under custom pid file scenario. 96851454a00816feb7e2aee4fe74d68c06ace3ad Gabe gabrielh@gmail.com a397e370a7e6f2f8f618355ca60034f942485d10 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/1bf2bb4cc66a3f571aa2d505f7aee366a209aa02 1bf2bb4cc66a3f571aa2d505f7aee366a209aa02 2008-04-21T21:07:59-07:00 2008-04-21T21:07:59-07:00 A bit clearer --init-file option description. b8fe20d9a07dc72533364e1775f7d8e54fe5e4ae Michael S. Klishin michael@novemberain.com 08fdcc9225db541caecacdf3c37607cfc83d9316 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a397e370a7e6f2f8f618355ca60034f942485d10 a397e370a7e6f2f8f618355ca60034f942485d10 2008-04-21T21:03:00-07:00 2008-04-21T21:03:00-07:00 Fix header shown in help: Merb is not longer 'Mongrel + Erb, a lightweight replacement for ActionPack' but a framework on it's own. d33fb303aa173acae6e85e51875fea78b92c99ba Michael S. Klishin michael@novemberain.com fee764c6902c1660f3514b627679a01b49af119b Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/0f9cd255c6309ebb38f2babe2e1fc506a42dd10e 0f9cd255c6309ebb38f2babe2e1fc506a42dd10e 2008-04-18T12:32:16-07:00 2008-04-18T12:32:16-07:00 More polish for deferred_actions support. Thin, Ebb and EMongrel adapters now turn the mutex off by default so the whole deferred? thing can work, having the Dispatcher's mutex turned on will precvent deferred_actions from working. 8ff363df44b1312b9f598646a742ac86b821a565 Ezra Zygmuntowicz ez@engineyard.com adad648d6c700c7ff450ae7a6f1abf3ca136264a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/0a15099a76e50b6d3419a81c2acdb6b9214e0a71 0a15099a76e50b6d3419a81c2acdb6b9214e0a71 2008-03-12T13:28:08-07:00 2008-03-12T13:28:08-07:00 Added --sandbox (-S) option for IRB console When specified, the console will call open_sandbox! which in turn calls any ORM module's method of the same name (the modules Merb::Orm::* are considered). It's up to the ORM implementation to start a transaction. When you exit the IRB session, close_sandbox! will rollback any open transactions, again by calling the appropriate ORM implementation of that method. See Merb::Orms::ActiveRecord for an example. 1c1a87d1fcec5b1ebcf56effd2eec4e095730b1c Fabien Franzen info@atelierfabien.be e6303b6c9a656156acdb516ebb08614af102a25f Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/2f1555c55cd6957a1fc245a1daf079de7cb7c1dc 2f1555c55cd6957a1fc245a1daf079de7cb7c1dc 2008-03-10T12:09:56-07:00 2008-03-10T12:09:56-07:00 Important changes to the BootLoader process Merb::Config is now correctly taken into account in Rake (and spec_helper.rb). Before, Merb::BootLoader::Dependencies would require config/init.rb and config/environments/*.rb, but due to the nature of Kernel#require, this would happen just once at runtime. Now Kernel#load will (re)load the init files whenever the Merb::BootLoader::Dependencies step is run. For Rake this happens twice: the first time to load dependencies to gather additional Rake tasks, the second time if a task depends on the :merb_env task. Without the fixes, the :merb_env just loaded with the default config. In spec_helper.rb (of a generated Merb app) the Merb BootLoader would run twice during 'rake specs' (once for controller specs, again for model specs) causing everyting to reload. The Merb::BootLoader::LoadClasses step proved to be problematic for some class definitions. The method Merb.start_environment has been added, to prevent the procedure from running through the BootLoader again if it has been encountered a second time. To enable greater control of certain core components being loaded, you can now work with Merb.disable(:comp, ...) which internally stores an array of symbols in Merb::Config[:disabled_components]. Sofar this has only been applied to the JSON Gems (Merb.disable :json) but it has been implemented to be a generalization of it. A pesky bug concerning Merb::BootLoader.subclasses being emptied has been fixed too. 0e516fec559c95eda1e18685537ed387a5b1fe2b Fabien Franzen info@atelierfabien.be dd1894e76d4253bbe4faa2fb1201c6bed2498f05 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/a90df4f413db9c6377f776b32da67e3b83131880 a90df4f413db9c6377f776b32da67e3b83131880 2008-03-05T15:52:01-08:00 2008-03-05T15:52:01-08:00 remove some vestigal config defaults 397f45b31660474fb54a004388ec9d825daab84d Ezra Zygmuntowicz ez@engineyard.com c5048dd27a6c50d1b3c4c779cf8a9b84b592ab9c Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/9a59da73e62bfc0c20ca7e87292a83b07771356b 9a59da73e62bfc0c20ca7e87292a83b07771356b 2008-02-28T11:21:02-08:00 2008-02-27T23:40:44-08:00 Documentation standards changes Overhauled the method documentation to match the emerging documentation standards in #161. Signed-off-by: Yehuda Katz <wycats@gmail.com> 14489eecc6c5253947532a39a5182e1acd7ae1a9 Yehuda Katz wycats@gmail.com e910f6b229a88fdeb2e930fda62be2f22ca5f2ff Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/40150311bd2d337eaab3c66ba2cea9bb680031ef 40150311bd2d337eaab3c66ba2cea9bb680031ef 2008-02-26T12:50:01-08:00 2008-02-26T12:50:01-08:00 Make Merb.start default to the runner adapter make the merb bin default to mongrel 524a24b3f44f82999be519451984e36634a97604 Ezra Zygmuntowicz ez@engineyard.com 4cd91a55473b050c13ce0a5acef28f8048861144 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/56e23b507b8b30057717524a33388fc4bccbe39e 56e23b507b8b30057717524a33388fc4bccbe39e 2008-02-26T00:22:01-08:00 2008-02-26T00:22:01-08:00 allow the setting of a custom session key a115bf1869f23c20a93498840b10aa1c295c41a6 Ezra Zygmuntowicz ez@engineyard.com 061a2d0832285d01a5e716a1a56524f18fc296ba Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/4cd91a55473b050c13ce0a5acef28f8048861144 4cd91a55473b050c13ce0a5acef28f8048861144 2008-02-26T00:06:07-08:00 2008-02-25T21:07:10-08:00 Documentation cleanup Cleaned up and complemented documentation for Merb core, Config, Controller and Test::RequestHelper. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 8033cbde531bd10c918d76679be6b4c622398db3 Ezra Zygmuntowicz ez@engineyard.com 43ede96ddeffe6f804205eb510fc1e993efc0e36 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/061a2d0832285d01a5e716a1a56524f18fc296ba 061a2d0832285d01a5e716a1a56524f18fc296ba 2008-02-25T20:57:47-08:00 2008-02-25T20:57:47-08:00 Reformat some crazy whitespace 248a56147aa19ec3d0986ac4f350b5bdf385897b Yehuda Katz wycats@gmail.com