aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Avoid multiple default paths to server.pid fileTawan Sierek2016-01-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug (#22811) that occurs when rails server is started in daemon mode and optional path to the `server.pid` file is omitted. Store default path in a constant instead of evaluating it multiple time using `File.expand_path`. The bug in detail: The server startup procedure crashes, since it tries to open a file at `/tmp/pids/server.pid` instead of `<path to project>/tmp/pids/server.pid`. This bug was introduced in 51211a94bd when Rack was upgraded from version 1.x to 2.x. Since version 2.x, Rack does not memoize the options hash [1], and as a consequence `Rails::Server#default_options` will be evaluated multiple times. The hash returned by `Rails::Server#default_options` holds the default path to the `server.pid` file. The path is generated with the method `File.expand_path`. However, the return value of this method depends on the current working directory [2], which changes once `Process.daemon` is invoked by `Rack::Server#daemonize_app` and the process is detached from the current shell. Close #22811 [1]https://git.io/vzen2 [2]http://ruby-doc.org/core-2.1.5/File.html#method-c-expand_path
* Merge pull request #23014 from jonatack/improve-generated-config-filesRafael França2016-01-152-4/+6
|\ | | | | Improve generated config initializer files
| * Improve generated config initializer filesJon Atack2016-01-132-4/+6
| | | | | | | | | | | | | | | | - Fix grammar. - Improve readability/understanding. - Wrap lines at 80 characters. [skip ci]
* | bring back `TEST` env for `rake test`.Yves Senn2016-01-121-1/+6
|/ | | | | | | Closes #23027. This does not restore complete backwards compatibility. It simply passes the contets of the `TEST` env to the new runner.
* Merge pull request #22808 from y-yagi/do_not_clear_all_reportersKasper Timm Hansen2016-01-111-1/+2
|\ | | | | delete only unnecessary reporter
| * delete only unnecessary reporteryuuji.yaginuma2016-01-111-1/+2
| | | | | | | | | | Reporter that defines its own users at the time of this process are also loaded, to avoid them from being deleted, to delete only the specified to unnecessary reporter.
* | Added multiple line filters support for test runnerSiva Gollapalli2016-01-102-4/+9
| |
* | Merge pull request #22703 from joshsoftware/rake-log-clearKasper Timm Hansen2016-01-091-6/+19
|\ \ | | | | | | rake log:clear task updated
| * | rake log:clear task updated refs[#22544]Pramod2016-01-091-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | - Avoided truncating all files if no ENV['LOGS'] specified - Updated task to accept LOGS=all for truncating all files from log/ i.e. log/*log - If no LOGS specified will truncates standard environment log files i.e. 'development,test,production' - CHANGELOG & guide update added - bin/setup test cases fixed
* | | [ci skip] Clarify some Minitest origins.Kasper Timm Hansen2016-01-091-0/+2
| | | | | | | | | | | | | | | It might be tough for readers to know why we implement `===`, and where the Regexp in `derive_regexp` came from.
* | | Extract line filtering to Railties.Kasper Timm Hansen2016-01-092-0/+69
|/ / | | | | | | | | | | | | | | | | | | | | | | The line filter parsing added to ActiveSupport::TestCase is only half the story to enable line filtering. The other half, of adding the patterns to the options, is done in the Minitest plugin that Railties has. Thus it makes more sense to have the filter in Railties with the other half and all the line filtering tests. Move the filter and extend Active Support in an initializer, so that when users or `rails/all.rb` require `rails/test_unit/railtie` we can still filter by line.
* | Default new apps to tag logs with `request_id`schneems2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In high volume applications it can be very difficult to figure out what is happening in logs because each request is not easily identified. For example 3 requests could look something like this: ``` Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 Rendered welcome/index.html.erb within layouts/application (0.1ms) Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:22 +0000 Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:23 +0000 Rendered welcome/index.html.erb within layouts/application (0.1ms) Processing by WelcomeController#index as HTML Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) Processing by WelcomeController#index as HTML Rendered welcome/index.html.erb within layouts/application (0.1ms) Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) Processing by WelcomeController#index as HTML Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` The `:request_id` log tag ensures that each request is tagged with a unique identifier. While they are still interleaved it is possible to figure out which lines belong to which requests. Like: ``` [c6034478-4026-4ded-9e3c-088c76d056f1] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 [c6034478-4026-4ded-9e3c-088c76d056f1] Rendered welcome/index.html.erb within layouts/application (0.1ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:22 +0000 [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:23 +0000 [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Rendered welcome/index.html.erb within layouts/application (0.1ms) [c6034478-4026-4ded-9e3c-088c76d056f1] Processing by WelcomeController#index as HTML [c6034478-4026-4ded-9e3c-088c76d056f1] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Processing by WelcomeController#index as HTML [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Rendered welcome/index.html.erb within layouts/application (0.1ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Processing by WelcomeController#index as HTML [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` Now if you have the logs and you find this unique ID you can filter to only look at information from that request. So a filtered log output would be very clear: ``` [c6034478-4026-4ded-9e3c-088c76d056f1] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 [c6034478-4026-4ded-9e3c-088c76d056f1] Rendered welcome/index.html.erb within layouts/application (0.1ms) [c6034478-4026-4ded-9e3c-088c76d056f1] Processing by WelcomeController#index as HTML [c6034478-4026-4ded-9e3c-088c76d056f1] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` In addition to this benefit the `:request_id` can be set via the `X-Request-ID` header so that the same request could be traced between multiple components. For example a request comes in Nginx (or another load balancer) could assign a request id. As the load balancer processes the request I can log using that id, then when the request is passed on to Rails, the same id is used. That way if a problem is determined to be not caused in Rails it could be traced back to other components with the same ID. You can set a value in nginx for example using something like this: ``` location / { proxy_pass http://upstream; proxy_set_header X-Request-Id $pid-$msec-$remote_addr-$request_length; } # http://stackoverflow.com/questions/17748735/setting-a-trace-id-in-nginx-load-balancer ``` Heroku sets this header value so problems like timeouts that are logged by like router can be traced back to specific request within the application. Whether you are using components that are setting request ID or not, all production applications can benefit from the additional debugging information of having a unique identifier for all requests. This change will only affect new applications, anyone can opt out by commenting or removing the line in `config/production.rb`.
* | Merge pull request #22933 from schneems/schneems/fix-broadcastRichard Schneeman2016-01-061-2/+4
|\ \ | | | | | | [close #22917] Don't output to `STDOUT` twice
| * | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `rails console` or `rails server` are used along with a logger set to output to `STDOUT` then the contents will show up twice. This happens because the logger is extended with `ActiveSupportLogger.broadcast` with a destination of STDOUT even if it is already outputting to `STDOUT`. Previously PR #22592 attempted to fix this issue, but it ended up causing NoMethodErrors. A better approach than relying on adding a method and flow control is to inspect the log destination directly. For this `ActiveSupport::Logger.logger_outputs_to?` was introduced ```ruby logger = Logger.new(STDOUT) ActiveSupport::Logger.logger_outputs_to?(logger, STDOUT) # => true ``` To accomplish this we must look inside of an instance variable of standard lib's Logger `@logdev`. There is a related Ruby proposal to expose this method in a standard way: https://bugs.ruby-lang.org/issues/11955
* | | Merge pull request #22939 from ↵Rafael França2016-01-062-1/+5
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/make_generated_controller_test_file_work_correctly make generated controller test work correctly
| * | | make generated controller test work correctlyyuuji.yaginuma2016-01-062-1/+5
| |/ / | | | | | | | | | | | | | | | | | | Since the `#file_name` that not consideration for the namespace, if generate a controller with a namespace, not the correct url helper generation, it had become an error to run the test. Modified to generate the correct url helper, even if it is produced a namespace with controller.
* | | Merge pull request #22275 from mastahyeti/per-form-csrfRafael França2016-01-061-0/+4
|\ \ \ | | | | | | | | Per-form CSRF tokens
| * | | add option for per-form CSRF tokensBen Toews2016-01-041-0/+4
| | | |
* | | | Provide a better error message if a user mistypes the name of script with runnerStephen Blackstone2016-01-051-1/+7
| |/ / |/| | | | | | | | Add tests for detecting bad options for runner
* | | :scissors: Unnecessary spacing in the generated codeAkira Matsuda2016-01-051-1/+1
|/ /
* | Merge pull request #22874 from ↵Rafael França2016-01-012-0/+0
|\ \ | | | | | | | | | | | | prathamesh-sonpatki/create-application-model-under-namespaced-dir-in-plugin Create application_record.rb under namespaced directory in plugin
| * | Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
| | | | | | | | | | | | | | | | | | - Earlier it was creating application_record.rb under `app/models`, after this change, it will create application_record.rb under `app/models/plugin_name` similar to other application classes.
* | | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
|/ /
* | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-311-1/+1
|\ \ | | | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-291-1/+1
| |/
* | [ci skip] Space out framework names in USAGEKasper Timm Hansen2015-12-302-5/+5
| | | | | | | | | | | | Two USAGE files were referring to Active Record and Active Model without a space, which is incorrect because we're referring to the framework name and not the constants.
* | Add sass-rails back to the default GemfileRafael Mendonça França2015-12-301-0/+2
|/ | | | It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
* Changed default value of `:rc` option to `nil`Prathamesh Sonpatki2015-12-251-1/+1
| | | | | | | - This fixes an error thrown by Thor because type of default value of `:rc` option which is `:boolean` does not match with it's default type which is `string`. - Ref - https://github.com/erikhuda/thor/blob/master/lib/thor/parser/option.rb#L125
* :scissors: whitespace in generated config files [skip ci]Jon Atack2015-12-242-2/+2
|
* Merge pull request #22750 from nettofarah/patch-1Sean Griffin2015-12-231-1/+26
|\ | | | | Plugin Usage and Installation instructions
| * Plugin Usage and Installation instructionsNetto Farah2015-12-231-1/+26
| |
* | Move test coloring closer to where it's used.Kasper Timm Hansen2015-12-231-15/+9
| | | | | | | | | | | | | | | | | | | | | | Didn't like the constant being at the top of the file, gave it overdue importance. Now that `color_output` expects a result we can shorten some of the flexibility from earlier: * Inline COLOR_CODES constant (keep local variable for readability, but don't need names of colors at run time). * Inline color variable in `color_output`. Looks just as clear without it.
* | Remove local variable color.Kasper Timm Hansen2015-12-231-5/+5
| | | | | | | | | | Focus `color_output`'s intent on coloring output by a result. We aren't meant to pass it arbitrary codes to color output.
* | Rename color to color_output.Kasper Timm Hansen2015-12-231-6/+5
| | | | | | | | | | | | The word color is being thrown all around with slightly different meanings. Right now, I understand it. But I'd like to be more immediately clear.
* | Remove unused blue color.Kasper Timm Hansen2015-12-231-2/+1
| | | | | | | | I got the blues because we aren't coloring any lines blue.
* | Color failure line by result code.Kasper Timm Hansen2015-12-231-1/+1
| | | | | | | | | | | | | | The static red color wouldn't paint skips in their designated yellow. Use the color name we got from the result label earlier, which marks skips as yellow.
* | Rewrite aggregated results suppression.Kasper Timm Hansen2015-12-231-10/+4
| | | | | | | | | | | | | | | | I should have replaced the summary reporter with a subclass the first time I wrote this. For whatever reason, I didn't. Do it right and slim the methods added to Minitest in the process.
* | [ci skip] Clarify why we're clearing reporters.Kasper Timm Hansen2015-12-231-1/+1
| | | | | | | | | | | | Minitest by default includes a summary reporter and a progress reporter. To print colored output, we have to replace the progress reporter.
* | Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-outputKasper Timm Hansen2015-12-232-1/+47
|\ \ | | | | | | Add colored output to the new test reporter.
| * | Add colored output to the new test reporter.Lucas Mazza2015-12-222-1/+47
| |/
* | Merge pull request #22757 from paulkogel/patch-1Rafael França2015-12-221-1/+1
|\ \ | | | | | | seeds.rb.tt: fix English.
| * | seeds.rb.tt: fix English.Paul Kögel2015-12-221-1/+1
| | |
* | | remove cors initializer from rails appyuuji.yaginuma2015-12-221-0/+6
|/ / | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app.
* | Merge pull request #22753 from gwincr11/keeps-options-breaks-assetsMatthew Draper2015-12-221-1/+1
|\ \ | |/ |/| Fix .keep file issue with ActionCable
| * Fix .keep file issue with ActionCableCory Gwin2015-12-211-1/+1
| | | | | | | | | | | | Fixes #22708 Make sure the channels file is create in assets/javascript/ so require tree works in asset pipeline.
* | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cableRafael França2015-12-211-0/+8
|\ \ | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set.
| * | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669.
* | | Merge pull request #22684 from ↵Yves Senn2015-12-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | teknofire/fix-using-add_resource-with-a-block-after-gem-call Fix using add_resource with a block after gem in custom generators
| * | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-211-1/+1
| |/ / | | | | | | | | | generator template.
* | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_reportKasper Timm Hansen2015-12-211-1/+7
|\ \ \ | | | | | | | | display detailed information in inline reporting
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 13:03:37 +0000