9d0f3671aaa57a5e897af8b5768fd378642ec41c 4405ac5db172a40d533b71a0a57a3233aea13435 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9e20155c58a88fd64721176b4979c52dfbf5b495 9e20155c58a88fd64721176b4979c52dfbf5b495 2008-09-27T22:25:06-07:00 2008-09-27T22:25:06-07:00 Merge branch 'forking_bootloader' into forking_runner dfbce69132e643e821e1d1f2194d8ba3f76787cc Yehuda Katz wycats@gmail.com 247779ebe96100b49690581801a897636e72b36a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/4405ac5db172a40d533b71a0a57a3233aea13435 4405ac5db172a40d533b71a0a57a3233aea13435 2008-09-27T22:24:39-07:00 2008-09-27T22:24:39-07:00 Add --fast-deploy option 55278af25b5cb51e26f3e5131585788af1b85a94 Yehuda Katz wycats@gmail.com 7d800b90cf19a1d77ef5a1669b8716cfc1c55e8e 247779ebe96100b49690581801a897636e72b36a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9d0f3671aaa57a5e897af8b5768fd378642ec41c 9d0f3671aaa57a5e897af8b5768fd378642ec41c 2008-09-27T22:19:53-07:00 2008-09-27T22:19:53-07:00 Merge branch 'forking_bootloader' into forking_runner 9861981da20421a75748e9ecbb05f1390e459e0a Yehuda Katz wycats@gmail.com 55dcdc6fbc29257dcaf25997d59cdf66fb66a507 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/247779ebe96100b49690581801a897636e72b36a 247779ebe96100b49690581801a897636e72b36a 2008-09-27T22:19:39-07:00 2008-09-27T22:19:39-07:00 Operator precedence ftl e83ae3ffd25175a6415ce57397df14f357af203c Yehuda Katz wycats@gmail.com 749ecc3386e97711c7484cb58f14618b8907a333 55dcdc6fbc29257dcaf25997d59cdf66fb66a507 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7d800b90cf19a1d77ef5a1669b8716cfc1c55e8e 7d800b90cf19a1d77ef5a1669b8716cfc1c55e8e 2008-09-27T21:32:11-07:00 2008-09-27T21:32:11-07:00 Merge branch 'forking_bootloader' into forking_runner c8a96a6f83ddfb4843866ce5be9666214a3fb11f Yehuda Katz wycats@gmail.com 9440e521e1dbc6bc45dfc06b136a69edbfc677bc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/55dcdc6fbc29257dcaf25997d59cdf66fb66a507 55dcdc6fbc29257dcaf25997d59cdf66fb66a507 2008-09-27T21:31:53-07:00 2008-09-27T21:31:53-07:00 Somehow the code that supports a single log file went missing :P bb74965f00abaa2914169f219d275fd0918eef03 Yehuda Katz wycats@gmail.com 11288ab711fede5c10f25a88916dace0cff2b193 9440e521e1dbc6bc45dfc06b136a69edbfc677bc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/749ecc3386e97711c7484cb58f14618b8907a333 749ecc3386e97711c7484cb58f14618b8907a333 2008-09-27T18:45:53-07:00 2008-09-27T18:45:53-07:00 Merge branch 'forking_bootloader' into forking_runner 5951c29a4f7bbf7c6996953eb16ce12e59652756 Yehuda Katz wycats@gmail.com 2c3e51f33a2de21b1a28f2172d768b9e8f5cd620 e579ac13048078cde36be479d135ac68d6a3fa9a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/11288ab711fede5c10f25a88916dace0cff2b193 11288ab711fede5c10f25a88916dace0cff2b193 2008-09-27T18:41:55-07:00 2008-09-27T18:41:55-07:00 Update from remote 342d1b922fffa464248fdd33c1a630a60e644f42 Yehuda Katz wycats@gmail.com 897d708f06f2bcf0186edbd51835d473ecf42146 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/2c3e51f33a2de21b1a28f2172d768b9e8f5cd620 2c3e51f33a2de21b1a28f2172d768b9e8f5cd620 2008-09-27T18:40:24-07:00 2008-09-27T18:40:24-07:00 Hpricot should work if available. 342d1b922fffa464248fdd33c1a630a60e644f42 Yehuda Katz wycats@gmail.com afc291cd9d5c660c4071741b21e79a3df62223f2 b7e9fc3e9f08c7970d1b6d69928e832511c7f2fe Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9440e521e1dbc6bc45dfc06b136a69edbfc677bc 9440e521e1dbc6bc45dfc06b136a69edbfc677bc 2008-09-27T18:29:32-07:00 2008-09-27T18:29:32-07:00 Merge branch 'forking_bootloader' of git@github.com:wycats/merb-core into forking_bootloader Fixed Conflicts: lib/merb-core.rb lib/merb-core/bootloader.rb lib/merb-core/server.rb b704dedef637f28bcd51927f6c442bcd1896f3e2 Yehuda Katz wycats@gmail.com 67e1756c267edb27f0229e0e7f9883736868742a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/afc291cd9d5c660c4071741b21e79a3df62223f2 afc291cd9d5c660c4071741b21e79a3df62223f2 2008-09-27T18:27:12-07:00 2008-09-27T13:23:28-07:00 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 9cdf7dc797772bbf506d7431ca00f168af4b1acf Yehuda Katz wycats@gmail.com eb52fcec508a458af4d2d286223960b24a2954c3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/67e1756c267edb27f0229e0e7f9883736868742a 67e1756c267edb27f0229e0e7f9883736868742a 2008-09-27T18:27:12-07:00 2008-09-27T13:14:16-07:00 get merb -k and merb -K to work (with and without `all') 08412e7875ad02914fc7ffafed26f0c2461505f5 Yehuda Katz wycats@gmail.com 70a47b4b70c67a0328f1845fab0f9ef258a1ec87 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/eb52fcec508a458af4d2d286223960b24a2954c3 eb52fcec508a458af4d2d286223960b24a2954c3 2008-09-27T18:27:11-07:00 2008-09-27T13:13:48-07:00 Fix bug with creating a new log ee512cefb501595ac22f5396c71a9323eb3db2ac Yehuda Katz wycats@gmail.com fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/70a47b4b70c67a0328f1845fab0f9ef258a1ec87 70a47b4b70c67a0328f1845fab0f9ef258a1ec87 2008-09-27T18:27:11-07:00 2008-09-26T23:58:28-07:00 Reload spec needs to be added back later; logger specs work again after removing mocks and modifying specs for public API changes 4244e1f7d818994256ce62c9a816395f288db99c Yehuda Katz wycats@gmail.com d22b8e6c60b48718e7484a1154a2211c5fa17404 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 2008-09-27T18:27:11-07:00 2008-09-26T23:38:57-07:00 Fix logger helper 5bb7382bc73d4c13eee8616ebe23541a835f956c Yehuda Katz wycats@gmail.com 205f2436a741841abc92901c015f3c470a5b99b7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/d22b8e6c60b48718e7484a1154a2211c5fa17404 d22b8e6c60b48718e7484a1154a2211c5fa17404 2008-09-27T18:27:11-07:00 2008-09-26T22:12:14-07:00 Attempt threadsafe logger 9d93c09c0802c69379c67e15cd863be22b5fa372 Yehuda Katz wycats@gmail.com 27779e1f857c3555c87451a1011bbeee646fa1f5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/205f2436a741841abc92901c015f3c470a5b99b7 205f2436a741841abc92901c015f3c470a5b99b7 2008-09-27T18:27:11-07:00 2008-09-25T23:57:07-07:00 Hide the backtrace for Mongrel timeout errors. 9a40349d32a3489fbd4295b63c3bca455d36d7cf Yehuda Katz wycats@gmail.com f4fd0d39ea76e1722ee115f15f307732603d7ce4 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/27779e1f857c3555c87451a1011bbeee646fa1f5 27779e1f857c3555c87451a1011bbeee646fa1f5 2008-09-27T18:27:11-07:00 2008-09-25T23:22:17-07:00 Respawn processes killed with kill -9 2f55b2eacaf2b501dffe9962c4774af332f844c1 Yehuda Katz wycats@gmail.com acb90a6e57e075717a235f5896df545937880416 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/f4fd0d39ea76e1722ee115f15f307732603d7ce4 f4fd0d39ea76e1722ee115f15f307732603d7ce4 2008-09-27T18:27:11-07:00 2008-09-25T23:18:02-07:00 Tons of comments; support for various forking configurations 9ec5a670f27e5c4a73ce8bd312fc795566d21427 Yehuda Katz wycats@gmail.com ab4f142a2433452c940696d2f6bd9e23e375ea20 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/acb90a6e57e075717a235f5896df545937880416 acb90a6e57e075717a235f5896df545937880416 2008-09-27T18:27:10-07:00 2008-09-25T22:32:13-07:00 Forking setup works without any forking. b915661f0e3532d1046a6ed030630b57c74970c6 Yehuda Katz wycats@gmail.com e5937d5a6a08d29fcf0d40b3eb6e18a6dc7191a7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ab4f142a2433452c940696d2f6bd9e23e375ea20 ab4f142a2433452c940696d2f6bd9e23e375ea20 2008-09-27T18:27:10-07:00 2008-09-25T17:59:58-07:00 Update thin for new stop() API d98332122c8541d9b4612a88d702707ed9e43458 Yehuda Katz wycats@gmail.com 04e2a9b4e7e997613d0f712d4d79612304066808 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e5937d5a6a08d29fcf0d40b3eb6e18a6dc7191a7 e5937d5a6a08d29fcf0d40b3eb6e18a6dc7191a7 2008-09-27T18:27:10-07:00 2008-09-25T17:58:35-07:00 Added better errors for failures originating with Merb 40c3e71595bec6a589c2a008d6904d94cff1fec5 Yehuda Katz wycats@gmail.com 7e8385254168c99e39208fbadbdb4758c9f52b92 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/04e2a9b4e7e997613d0f712d4d79612304066808 04e2a9b4e7e997613d0f712d4d79612304066808 2008-09-27T18:27:10-07:00 2008-09-25T17:57:20-07:00 Checked in experiments (for posterity) b4d90d8944778b215c7714e29097e36bf69e5907 Yehuda Katz wycats@gmail.com abe9f500695154adc0da4535652ef8a070435875 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7e8385254168c99e39208fbadbdb4758c9f52b92 7e8385254168c99e39208fbadbdb4758c9f52b92 2008-09-27T18:27:09-07:00 2008-09-25T13:16:56-07:00 All Ruby-based servers work now with forking; NEXT: Make forking only happen when appropriate d7523e645ea199be6de4e436d2ab5277e484eac5 Yehuda Katz wycats@gmail.com 388941a35c0454153f0e80ae9ec9deb44c5d2252 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/abe9f500695154adc0da4535652ef8a070435875 abe9f500695154adc0da4535652ef8a070435875 2008-09-27T18:27:09-07:00 2008-09-25T01:35:33-07:00 Help REE make better use of GC 3683ac5ca2b4d02d3e35f084795bc8ec48fe2780 Yehuda Katz wycats@gmail.com a5b48f4ba2ac499a020d748466f8cba2a8223fb6 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/388941a35c0454153f0e80ae9ec9deb44c5d2252 388941a35c0454153f0e80ae9ec9deb44c5d2252 2008-09-27T18:27:09-07:00 2008-09-24T23:47:13-07:00 Ebb works 90217ef6f2591a04c4b1098d38f1af26e0faf1f8 Yehuda Katz wycats@gmail.com 6e2a107c4bec7281ff944b92dd426f1c47137663 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a5b48f4ba2ac499a020d748466f8cba2a8223fb6 a5b48f4ba2ac499a020d748466f8cba2a8223fb6 2008-09-27T18:27:09-07:00 2008-09-24T22:26:07-07:00 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 c8763001443d613c4df1550f95bfdf9ef6d8202b Yehuda Katz wycats@gmail.com 717d5a8667a1fc206061c007e00528643676fb5e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/6e2a107c4bec7281ff944b92dd426f1c47137663 6e2a107c4bec7281ff944b92dd426f1c47137663 2008-09-27T18:27:09-07:00 2008-09-24T12:10:55-07:00 Fix some more issues relating to graceful exits; remove pids on exit; TODO: merb -k must work 95474547469eb19cc9441d1ae6b1bcd8aecaad54 Yehuda Katz wycats@gmail.com 76eba224d0beed7a32a2e20826f0f0574a4e20c9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/717d5a8667a1fc206061c007e00528643676fb5e 717d5a8667a1fc206061c007e00528643676fb5e 2008-09-27T18:27:09-07:00 2008-09-24T00:05:26-07:00 Tighten things up so that ctrl-c works correctly 7b2bd7b3e60bc063c738010b1c29a7382fee039b Yehuda Katz wycats@gmail.com ca5d6b2a3df884a074d289a41eeb56f540849686 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/76eba224d0beed7a32a2e20826f0f0574a4e20c9 76eba224d0beed7a32a2e20826f0f0574a4e20c9 2008-09-27T18:27:09-07:00 2008-09-23T21:18:20-07:00 Reload works again ff19879fa2bd0665c8d069c4cf3f7786062ccceb Yehuda Katz wycats@gmail.com