itsi 0.1.11 → 0.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Cargo.lock +1535 -45
- data/{sandbox/itsi_itsi_file/Itsi.rb → Itsi.rb} +19 -13
- data/Rakefile +8 -7
- data/crates/itsi_error/src/lib.rs +9 -0
- data/crates/itsi_rb_helpers/Cargo.toml +1 -0
- data/crates/itsi_rb_helpers/src/heap_value.rs +18 -0
- data/crates/itsi_rb_helpers/src/lib.rs +34 -7
- data/crates/itsi_server/Cargo.toml +69 -30
- data/crates/itsi_server/src/lib.rs +79 -147
- data/crates/itsi_server/src/{body_proxy → ruby_types/itsi_body_proxy}/big_bytes.rs +10 -5
- data/crates/itsi_server/src/{body_proxy/itsi_body_proxy.rs → ruby_types/itsi_body_proxy/mod.rs} +22 -3
- data/crates/itsi_server/src/ruby_types/itsi_grpc_request.rs +147 -0
- data/crates/itsi_server/src/ruby_types/itsi_grpc_response.rs +19 -0
- data/crates/itsi_server/src/ruby_types/itsi_grpc_stream/mod.rs +216 -0
- data/{gems/server/ext/itsi_server/src/request/itsi_request.rs → crates/itsi_server/src/ruby_types/itsi_http_request.rs} +101 -117
- data/crates/itsi_server/src/{response/itsi_response.rs → ruby_types/itsi_http_response.rs} +72 -41
- data/crates/itsi_server/src/ruby_types/itsi_server/file_watcher.rs +225 -0
- data/crates/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs +355 -0
- data/crates/itsi_server/src/ruby_types/itsi_server.rs +82 -0
- data/crates/itsi_server/src/ruby_types/mod.rs +55 -0
- data/crates/itsi_server/src/server/bind.rs +13 -5
- data/crates/itsi_server/src/server/byte_frame.rs +32 -0
- data/crates/itsi_server/src/server/cache_store.rs +74 -0
- data/crates/itsi_server/src/server/itsi_service.rs +172 -0
- data/crates/itsi_server/src/server/lifecycle_event.rs +3 -0
- data/crates/itsi_server/src/server/listener.rs +102 -2
- data/crates/itsi_server/src/server/middleware_stack/middleware.rs +153 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/allow_list.rs +47 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/auth_api_key.rs +58 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/auth_basic.rs +82 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/auth_jwt.rs +321 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/cache_control.rs +139 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/compression.rs +300 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/cors.rs +287 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/deny_list.rs +48 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/error_response.rs +127 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/etag.rs +191 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/grpc_service.rs +72 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/header_interpretation.rs +85 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/intrusion_protection.rs +195 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/log_requests.rs +82 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/mod.rs +82 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/proxy.rs +216 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/rate_limit.rs +124 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/redirect.rs +76 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/request_headers.rs +43 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/response_headers.rs +34 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/ruby_app.rs +93 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/static_assets.rs +162 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/string_rewrite.rs +158 -0
- data/crates/itsi_server/src/server/middleware_stack/middlewares/token_source.rs +12 -0
- data/crates/itsi_server/src/server/middleware_stack/mod.rs +315 -0
- data/crates/itsi_server/src/server/mod.rs +8 -1
- data/crates/itsi_server/src/server/process_worker.rs +38 -12
- data/crates/itsi_server/src/server/rate_limiter.rs +565 -0
- data/crates/itsi_server/src/server/request_job.rs +11 -0
- data/crates/itsi_server/src/server/serve_strategy/cluster_mode.rs +119 -42
- data/crates/itsi_server/src/server/serve_strategy/mod.rs +9 -6
- data/crates/itsi_server/src/server/serve_strategy/single_mode.rs +256 -111
- data/crates/itsi_server/src/server/signal.rs +19 -0
- data/crates/itsi_server/src/server/static_file_server.rs +984 -0
- data/crates/itsi_server/src/server/thread_worker.rs +139 -94
- data/crates/itsi_server/src/server/types.rs +43 -0
- data/crates/itsi_server/test.md +14 -0
- data/crates/itsi_tracing/Cargo.toml +1 -0
- data/crates/itsi_tracing/src/lib.rs +216 -45
- data/docs/.gitignore +7 -0
- data/docs/.gitpod.yml +15 -0
- data/docs/Itsi.rb +17 -0
- data/docs/content/_index.md +17 -0
- data/docs/content/about.md +6 -0
- data/docs/content/docs/_index.md +18 -0
- data/docs/content/docs/first-page.md +9 -0
- data/docs/content/docs/folder/_index.md +10 -0
- data/docs/content/docs/folder/leaf.md +7 -0
- data/docs/go.mod +5 -0
- data/docs/go.sum +2 -0
- data/docs/hugo.yaml +77 -0
- data/examples/static_assets_example.rb +83 -0
- data/gems/_index.md +18 -0
- data/gems/scheduler/CODE_OF_CONDUCT.md +7 -0
- data/gems/scheduler/Cargo.lock +75 -14
- data/gems/scheduler/README.md +5 -0
- data/gems/scheduler/_index.md +7 -0
- data/gems/scheduler/itsi-scheduler.gemspec +4 -1
- data/gems/scheduler/lib/itsi/scheduler/version.rb +1 -1
- data/gems/scheduler/lib/itsi/scheduler.rb +2 -2
- data/gems/scheduler/test/test_file_io.rb +0 -1
- data/gems/scheduler/test/test_itsi_scheduler.rb +1 -1
- data/gems/server/CHANGELOG.md +5 -0
- data/gems/server/CODE_OF_CONDUCT.md +7 -0
- data/gems/server/Cargo.lock +1536 -45
- data/gems/server/README.md +4 -0
- data/gems/server/_index.md +6 -0
- data/gems/server/exe/itsi +33 -74
- data/gems/server/itsi-server.gemspec +3 -2
- data/gems/server/lib/itsi/{request.rb → http_request.rb} +29 -5
- data/gems/server/lib/itsi/http_response.rb +39 -0
- data/gems/server/lib/itsi/server/Itsi.rb +11 -19
- data/gems/server/lib/itsi/server/config/dsl.rb +506 -0
- data/gems/server/lib/itsi/server/config.rb +103 -8
- data/gems/server/lib/itsi/server/default_app/default_app.rb +38 -0
- data/gems/server/lib/itsi/server/grpc_interface.rb +213 -0
- data/gems/server/lib/itsi/server/rack/handler/itsi.rb +8 -17
- data/gems/server/lib/itsi/server/rack_interface.rb +23 -4
- data/gems/server/lib/itsi/server/scheduler_interface.rb +1 -1
- data/gems/server/lib/itsi/server/scheduler_mode.rb +4 -0
- data/gems/server/lib/itsi/server/signal_trap.rb +7 -1
- data/gems/server/lib/itsi/server/version.rb +1 -1
- data/gems/server/lib/itsi/server.rb +74 -63
- data/gems/server/lib/itsi/standard_headers.rb +86 -0
- data/gems/server/test/helpers/test_helper.rb +12 -12
- data/gems/server/test/test_itsi_server.rb +2 -2
- data/lib/itsi/version.rb +1 -1
- data/sandbox/itsi_file/Gemfile +11 -0
- data/sandbox/itsi_file/Gemfile.lock +69 -0
- data/sandbox/itsi_file/Itsi.rb +276 -0
- data/sandbox/itsi_file/error.html +2 -0
- data/sandbox/itsi_file/organisations_controller.rb +20 -0
- data/sandbox/itsi_file/public/assets/image.png +0 -0
- data/sandbox/itsi_file/public/assets/index.html +1 -0
- data/sandbox/itsi_sandbox_hanami/Gemfile.lock +2 -2
- data/sandbox/itsi_sandbox_rack/Gemfile.lock +2 -2
- data/sandbox/itsi_sandbox_rack/config.ru +2 -15
- data/sandbox/itsi_sandbox_rails/.dockerignore +2 -5
- data/sandbox/itsi_sandbox_rails/.github/workflows/ci.yml +1 -1
- data/sandbox/itsi_sandbox_rails/.gitignore +2 -1
- data/sandbox/itsi_sandbox_rails/Dockerfile +6 -9
- data/sandbox/itsi_sandbox_rails/Gemfile +16 -22
- data/sandbox/itsi_sandbox_rails/Gemfile.lock +100 -225
- data/sandbox/itsi_sandbox_rails/app/assets/config/manifest.js +4 -0
- data/sandbox/itsi_sandbox_rails/app/assets/stylesheets/application.css +11 -6
- data/sandbox/itsi_sandbox_rails/app/channels/application_cable/channel.rb +4 -0
- data/sandbox/itsi_sandbox_rails/app/channels/application_cable/connection.rb +4 -0
- data/sandbox/itsi_sandbox_rails/app/controllers/live_controller.rb +7 -8
- data/sandbox/itsi_sandbox_rails/app/controllers/uploads_controller.rb +0 -3
- data/sandbox/itsi_sandbox_rails/app/views/layouts/application.html.erb +2 -7
- data/sandbox/itsi_sandbox_rails/bin/docker-entrypoint +3 -4
- data/sandbox/itsi_sandbox_rails/bin/setup +8 -5
- data/sandbox/itsi_sandbox_rails/config/application.rb +1 -35
- data/sandbox/itsi_sandbox_rails/config/cable.yml +3 -10
- data/sandbox/itsi_sandbox_rails/config/credentials.yml.enc +1 -1
- data/sandbox/itsi_sandbox_rails/config/database.yml +9 -19
- data/sandbox/itsi_sandbox_rails/config/environment.rb +1 -1
- data/sandbox/itsi_sandbox_rails/config/environments/development.rb +21 -12
- data/sandbox/itsi_sandbox_rails/config/environments/production.rb +49 -34
- data/sandbox/itsi_sandbox_rails/config/environments/test.rb +19 -5
- data/sandbox/itsi_sandbox_rails/config/initializers/assets.rb +5 -0
- data/sandbox/itsi_sandbox_rails/config/initializers/filter_parameter_logging.rb +1 -1
- data/sandbox/itsi_sandbox_rails/config/initializers/permissions_policy.rb +13 -0
- data/sandbox/itsi_sandbox_rails/config/puma.rb +2 -9
- data/sandbox/itsi_sandbox_rails/config.ru +0 -1
- data/sandbox/itsi_sandbox_rails/db/migrate/20250301041554_create_posts.rb +1 -1
- data/sandbox/itsi_sandbox_rails/db/schema.rb +2 -2
- data/sandbox/itsi_sandbox_rails/lib/assets/.keep +0 -0
- data/sandbox/itsi_sandbox_rails/public/404.html +66 -113
- data/sandbox/itsi_sandbox_rails/public/406-unsupported-browser.html +65 -113
- data/sandbox/itsi_sandbox_rails/public/422.html +66 -113
- data/sandbox/itsi_sandbox_rails/public/500.html +65 -113
- data/sandbox/itsi_sandbox_rails/public/icon.png +0 -0
- data/sandbox/itsi_sandbox_rails/public/icon.svg +2 -2
- data/sandbox/itsi_sandbox_rails/test/channels/application_cable/connection_test.rb +13 -0
- data/sandbox/itsi_sandbox_roda/Gemfile.lock +3 -10
- data/tasks.txt +72 -35
- metadata +89 -139
- data/crates/itsi_server/src/body_proxy/mod.rs +0 -2
- data/crates/itsi_server/src/request/itsi_request.rs +0 -298
- data/crates/itsi_server/src/request/mod.rs +0 -1
- data/crates/itsi_server/src/response/mod.rs +0 -1
- data/crates/itsi_server/src/server/itsi_server.rs +0 -288
- data/gems/scheduler/ext/itsi_error/Cargo.lock +0 -368
- data/gems/scheduler/ext/itsi_error/Cargo.toml +0 -11
- data/gems/scheduler/ext/itsi_error/src/from.rs +0 -68
- data/gems/scheduler/ext/itsi_error/src/lib.rs +0 -24
- data/gems/scheduler/ext/itsi_instrument_entry/Cargo.toml +0 -15
- data/gems/scheduler/ext/itsi_instrument_entry/src/lib.rs +0 -31
- data/gems/scheduler/ext/itsi_rb_helpers/Cargo.lock +0 -355
- data/gems/scheduler/ext/itsi_rb_helpers/Cargo.toml +0 -10
- data/gems/scheduler/ext/itsi_rb_helpers/src/heap_value.rs +0 -121
- data/gems/scheduler/ext/itsi_rb_helpers/src/lib.rs +0 -201
- data/gems/scheduler/ext/itsi_scheduler/Cargo.toml +0 -24
- data/gems/scheduler/ext/itsi_scheduler/extconf.rb +0 -6
- data/gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs +0 -56
- data/gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs +0 -44
- data/gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler/timer.rs +0 -44
- data/gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler.rs +0 -308
- data/gems/scheduler/ext/itsi_scheduler/src/lib.rs +0 -38
- data/gems/scheduler/ext/itsi_server/Cargo.lock +0 -2956
- data/gems/scheduler/ext/itsi_server/Cargo.toml +0 -50
- data/gems/scheduler/ext/itsi_server/extconf.rb +0 -6
- data/gems/scheduler/ext/itsi_server/src/body_proxy/big_bytes.rs +0 -104
- data/gems/scheduler/ext/itsi_server/src/body_proxy/itsi_body_proxy.rs +0 -122
- data/gems/scheduler/ext/itsi_server/src/body_proxy/mod.rs +0 -2
- data/gems/scheduler/ext/itsi_server/src/env.rs +0 -43
- data/gems/scheduler/ext/itsi_server/src/lib.rs +0 -180
- data/gems/scheduler/ext/itsi_server/src/request/itsi_request.rs +0 -298
- data/gems/scheduler/ext/itsi_server/src/request/mod.rs +0 -1
- data/gems/scheduler/ext/itsi_server/src/response/itsi_response.rs +0 -357
- data/gems/scheduler/ext/itsi_server/src/response/mod.rs +0 -1
- data/gems/scheduler/ext/itsi_server/src/server/bind.rs +0 -174
- data/gems/scheduler/ext/itsi_server/src/server/bind_protocol.rs +0 -37
- data/gems/scheduler/ext/itsi_server/src/server/io_stream.rs +0 -104
- data/gems/scheduler/ext/itsi_server/src/server/itsi_server.rs +0 -288
- data/gems/scheduler/ext/itsi_server/src/server/lifecycle_event.rs +0 -9
- data/gems/scheduler/ext/itsi_server/src/server/listener.rs +0 -318
- data/gems/scheduler/ext/itsi_server/src/server/mod.rs +0 -11
- data/gems/scheduler/ext/itsi_server/src/server/process_worker.rs +0 -203
- data/gems/scheduler/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs +0 -260
- data/gems/scheduler/ext/itsi_server/src/server/serve_strategy/mod.rs +0 -27
- data/gems/scheduler/ext/itsi_server/src/server/serve_strategy/single_mode.rs +0 -276
- data/gems/scheduler/ext/itsi_server/src/server/signal.rs +0 -74
- data/gems/scheduler/ext/itsi_server/src/server/thread_worker.rs +0 -399
- data/gems/scheduler/ext/itsi_server/src/server/tls/locked_dir_cache.rs +0 -132
- data/gems/scheduler/ext/itsi_server/src/server/tls.rs +0 -265
- data/gems/scheduler/ext/itsi_tracing/Cargo.lock +0 -274
- data/gems/scheduler/ext/itsi_tracing/Cargo.toml +0 -16
- data/gems/scheduler/ext/itsi_tracing/src/lib.rs +0 -58
- data/gems/server/ext/itsi_error/Cargo.lock +0 -368
- data/gems/server/ext/itsi_error/Cargo.toml +0 -11
- data/gems/server/ext/itsi_error/src/from.rs +0 -68
- data/gems/server/ext/itsi_error/src/lib.rs +0 -24
- data/gems/server/ext/itsi_instrument_entry/Cargo.toml +0 -15
- data/gems/server/ext/itsi_instrument_entry/src/lib.rs +0 -31
- data/gems/server/ext/itsi_rb_helpers/Cargo.lock +0 -355
- data/gems/server/ext/itsi_rb_helpers/Cargo.toml +0 -10
- data/gems/server/ext/itsi_rb_helpers/src/heap_value.rs +0 -121
- data/gems/server/ext/itsi_rb_helpers/src/lib.rs +0 -201
- data/gems/server/ext/itsi_scheduler/Cargo.toml +0 -24
- data/gems/server/ext/itsi_scheduler/extconf.rb +0 -6
- data/gems/server/ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs +0 -56
- data/gems/server/ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs +0 -44
- data/gems/server/ext/itsi_scheduler/src/itsi_scheduler/timer.rs +0 -44
- data/gems/server/ext/itsi_scheduler/src/itsi_scheduler.rs +0 -308
- data/gems/server/ext/itsi_scheduler/src/lib.rs +0 -38
- data/gems/server/ext/itsi_server/Cargo.lock +0 -2956
- data/gems/server/ext/itsi_server/Cargo.toml +0 -50
- data/gems/server/ext/itsi_server/extconf.rb +0 -6
- data/gems/server/ext/itsi_server/src/body_proxy/big_bytes.rs +0 -104
- data/gems/server/ext/itsi_server/src/body_proxy/itsi_body_proxy.rs +0 -122
- data/gems/server/ext/itsi_server/src/body_proxy/mod.rs +0 -2
- data/gems/server/ext/itsi_server/src/env.rs +0 -43
- data/gems/server/ext/itsi_server/src/lib.rs +0 -180
- data/gems/server/ext/itsi_server/src/request/mod.rs +0 -1
- data/gems/server/ext/itsi_server/src/response/itsi_response.rs +0 -357
- data/gems/server/ext/itsi_server/src/response/mod.rs +0 -1
- data/gems/server/ext/itsi_server/src/server/bind.rs +0 -174
- data/gems/server/ext/itsi_server/src/server/bind_protocol.rs +0 -37
- data/gems/server/ext/itsi_server/src/server/io_stream.rs +0 -104
- data/gems/server/ext/itsi_server/src/server/itsi_server.rs +0 -288
- data/gems/server/ext/itsi_server/src/server/lifecycle_event.rs +0 -9
- data/gems/server/ext/itsi_server/src/server/listener.rs +0 -318
- data/gems/server/ext/itsi_server/src/server/mod.rs +0 -11
- data/gems/server/ext/itsi_server/src/server/process_worker.rs +0 -203
- data/gems/server/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs +0 -260
- data/gems/server/ext/itsi_server/src/server/serve_strategy/mod.rs +0 -27
- data/gems/server/ext/itsi_server/src/server/serve_strategy/single_mode.rs +0 -276
- data/gems/server/ext/itsi_server/src/server/signal.rs +0 -74
- data/gems/server/ext/itsi_server/src/server/thread_worker.rs +0 -399
- data/gems/server/ext/itsi_server/src/server/tls/locked_dir_cache.rs +0 -132
- data/gems/server/ext/itsi_server/src/server/tls.rs +0 -265
- data/gems/server/ext/itsi_tracing/Cargo.lock +0 -274
- data/gems/server/ext/itsi_tracing/Cargo.toml +0 -16
- data/gems/server/ext/itsi_tracing/src/lib.rs +0 -58
- data/gems/server/lib/itsi/server/options_dsl.rb +0 -401
- data/gems/server/lib/itsi/stream_io.rb +0 -38
- data/location_dsl.rb +0 -381
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/docker-setup.sample +0 -3
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/post-app-boot.sample +0 -3
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/post-deploy.sample +0 -14
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/post-proxy-reboot.sample +0 -3
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/pre-app-boot.sample +0 -3
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/pre-build.sample +0 -51
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/pre-connect.sample +0 -47
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/pre-deploy.sample +0 -109
- data/sandbox/itsi_sandbox_rails/.kamal/hooks/pre-proxy-reboot.sample +0 -3
- data/sandbox/itsi_sandbox_rails/.kamal/secrets +0 -17
- data/sandbox/itsi_sandbox_rails/bin/dev +0 -2
- data/sandbox/itsi_sandbox_rails/bin/jobs +0 -6
- data/sandbox/itsi_sandbox_rails/bin/kamal +0 -27
- data/sandbox/itsi_sandbox_rails/bin/thrust +0 -5
- data/sandbox/itsi_sandbox_rails/config/cache.yml +0 -16
- data/sandbox/itsi_sandbox_rails/config/deploy.yml +0 -116
- data/sandbox/itsi_sandbox_rails/config/queue.yml +0 -18
- data/sandbox/itsi_sandbox_rails/config/recurring.yml +0 -10
- data/sandbox/itsi_sandbox_rails/db/cable_schema.rb +0 -11
- data/sandbox/itsi_sandbox_rails/db/cache_schema.rb +0 -14
- data/sandbox/itsi_sandbox_rails/db/queue_schema.rb +0 -129
- data/sandbox/itsi_sandbox_rails/public/400.html +0 -114
- data/sandbox/itsi_sandbox_rails/test/fixtures/posts.yml +0 -9
- data/sandbox/itsi_sandbox_rails/test/models/post_test.rb +0 -7
- /data/{sandbox/itsi_sandbox_rails/script/.keep → crates/_index.md} +0 -0
- /data/gems/server/lib/itsi/{index.html → server/default_app/index.html} +0 -0
@@ -1,399 +0,0 @@
|
|
1
|
-
use super::itsi_server::{RequestJob, Server};
|
2
|
-
use crate::{request::itsi_request::ItsiRequest, ITSI_SERVER};
|
3
|
-
use itsi_rb_helpers::{
|
4
|
-
call_with_gvl, call_without_gvl, create_ruby_thread, kill_threads, HeapVal, HeapValue,
|
5
|
-
};
|
6
|
-
use itsi_tracing::{debug, error, info, warn};
|
7
|
-
use magnus::{
|
8
|
-
error::Result,
|
9
|
-
value::{InnerValue, Lazy, LazyId, Opaque, ReprValue},
|
10
|
-
Module, RClass, Ruby, Thread, Value,
|
11
|
-
};
|
12
|
-
use nix::unistd::Pid;
|
13
|
-
use parking_lot::{Mutex, RwLock};
|
14
|
-
use std::{
|
15
|
-
num::NonZeroU8,
|
16
|
-
ops::Deref,
|
17
|
-
sync::{
|
18
|
-
atomic::{AtomicBool, Ordering},
|
19
|
-
Arc,
|
20
|
-
},
|
21
|
-
thread,
|
22
|
-
time::{Duration, Instant},
|
23
|
-
};
|
24
|
-
use tokio::{runtime::Builder as RuntimeBuilder, sync::watch};
|
25
|
-
use tracing::instrument;
|
26
|
-
pub struct ThreadWorker {
|
27
|
-
pub server: Arc<Server>,
|
28
|
-
pub id: String,
|
29
|
-
pub app: Opaque<Value>,
|
30
|
-
pub receiver: Arc<async_channel::Receiver<RequestJob>>,
|
31
|
-
pub sender: async_channel::Sender<RequestJob>,
|
32
|
-
pub thread: RwLock<Option<HeapValue<Thread>>>,
|
33
|
-
pub terminated: Arc<AtomicBool>,
|
34
|
-
pub scheduler_class: Option<Opaque<Value>>,
|
35
|
-
}
|
36
|
-
|
37
|
-
static ID_CALL: LazyId = LazyId::new("call");
|
38
|
-
static ID_ALIVE: LazyId = LazyId::new("alive?");
|
39
|
-
static ID_SCHEDULER: LazyId = LazyId::new("scheduler");
|
40
|
-
static ID_SCHEDULE: LazyId = LazyId::new("schedule");
|
41
|
-
static ID_BLOCK: LazyId = LazyId::new("block");
|
42
|
-
static ID_YIELD: LazyId = LazyId::new("yield");
|
43
|
-
static ID_CONST_GET: LazyId = LazyId::new("const_get");
|
44
|
-
static CLASS_FIBER: Lazy<RClass> = Lazy::new(|ruby| {
|
45
|
-
ruby.module_kernel()
|
46
|
-
.const_get::<_, RClass>("Fiber")
|
47
|
-
.unwrap()
|
48
|
-
});
|
49
|
-
|
50
|
-
pub struct TerminateWakerSignal(bool);
|
51
|
-
|
52
|
-
#[instrument(name = "Boot", parent=None, skip(server, threads, app, pid, scheduler_class))]
|
53
|
-
pub fn build_thread_workers(
|
54
|
-
server: Arc<Server>,
|
55
|
-
pid: Pid,
|
56
|
-
threads: NonZeroU8,
|
57
|
-
app: HeapVal,
|
58
|
-
scheduler_class: Option<String>,
|
59
|
-
) -> Result<(Arc<Vec<ThreadWorker>>, async_channel::Sender<RequestJob>)> {
|
60
|
-
let (sender, receiver) = async_channel::bounded(20);
|
61
|
-
let receiver_ref = Arc::new(receiver);
|
62
|
-
let sender_ref = sender;
|
63
|
-
let (app, scheduler_class) = load_app(app, scheduler_class)?;
|
64
|
-
Ok((
|
65
|
-
Arc::new(
|
66
|
-
(1..=u8::from(threads))
|
67
|
-
.map(|id| {
|
68
|
-
info!(pid = pid.as_raw(), id, "Thread");
|
69
|
-
ThreadWorker::new(
|
70
|
-
server.clone(),
|
71
|
-
format!("{:?}#{:?}", pid, id),
|
72
|
-
app,
|
73
|
-
receiver_ref.clone(),
|
74
|
-
sender_ref.clone(),
|
75
|
-
scheduler_class,
|
76
|
-
)
|
77
|
-
})
|
78
|
-
.collect::<Result<Vec<_>>>()?,
|
79
|
-
),
|
80
|
-
sender_ref,
|
81
|
-
))
|
82
|
-
}
|
83
|
-
|
84
|
-
pub fn load_app(
|
85
|
-
app: HeapVal,
|
86
|
-
scheduler_class: Option<String>,
|
87
|
-
) -> Result<(Opaque<Value>, Option<Opaque<Value>>)> {
|
88
|
-
call_with_gvl(|ruby| {
|
89
|
-
let app = Opaque::from(app.funcall::<_, _, Value>(*ID_CALL, ())?);
|
90
|
-
let scheduler_class = if let Some(scheduler_class) = scheduler_class {
|
91
|
-
Some(Opaque::from(
|
92
|
-
ruby.module_kernel()
|
93
|
-
.funcall::<_, _, Value>(*ID_CONST_GET, (scheduler_class,))?,
|
94
|
-
))
|
95
|
-
} else {
|
96
|
-
None
|
97
|
-
};
|
98
|
-
Ok((app, scheduler_class))
|
99
|
-
})
|
100
|
-
}
|
101
|
-
impl ThreadWorker {
|
102
|
-
pub fn new(
|
103
|
-
server: Arc<Server>,
|
104
|
-
id: String,
|
105
|
-
app: Opaque<Value>,
|
106
|
-
receiver: Arc<async_channel::Receiver<RequestJob>>,
|
107
|
-
sender: async_channel::Sender<RequestJob>,
|
108
|
-
scheduler_class: Option<Opaque<Value>>,
|
109
|
-
) -> Result<Self> {
|
110
|
-
let mut worker = Self {
|
111
|
-
server,
|
112
|
-
id,
|
113
|
-
app,
|
114
|
-
receiver,
|
115
|
-
sender,
|
116
|
-
thread: RwLock::new(None),
|
117
|
-
terminated: Arc::new(AtomicBool::new(false)),
|
118
|
-
scheduler_class,
|
119
|
-
};
|
120
|
-
worker.run()?;
|
121
|
-
Ok(worker)
|
122
|
-
}
|
123
|
-
|
124
|
-
#[instrument(skip(self), fields(id = self.id))]
|
125
|
-
pub async fn request_shutdown(&self) {
|
126
|
-
match self.sender.send(RequestJob::Shutdown).await {
|
127
|
-
Ok(_) => {}
|
128
|
-
Err(err) => error!("Failed to send shutdown request: {}", err),
|
129
|
-
};
|
130
|
-
debug!("Requesting shutdown");
|
131
|
-
}
|
132
|
-
|
133
|
-
#[instrument(skip(self, deadline), fields(id = self.id))]
|
134
|
-
pub fn poll_shutdown(&self, deadline: Instant) -> bool {
|
135
|
-
call_with_gvl(|_ruby| {
|
136
|
-
if let Some(thread) = self.thread.read().deref() {
|
137
|
-
if Instant::now() > deadline {
|
138
|
-
warn!("Worker shutdown timed out. Killing thread");
|
139
|
-
self.terminated.store(true, Ordering::SeqCst);
|
140
|
-
kill_threads(vec![thread.as_value()]);
|
141
|
-
}
|
142
|
-
if thread.funcall::<_, _, bool>(*ID_ALIVE, ()).unwrap_or(false) {
|
143
|
-
return true;
|
144
|
-
}
|
145
|
-
debug!("Thread has shut down");
|
146
|
-
}
|
147
|
-
self.thread.write().take();
|
148
|
-
|
149
|
-
false
|
150
|
-
})
|
151
|
-
}
|
152
|
-
|
153
|
-
pub fn run(&mut self) -> Result<()> {
|
154
|
-
let id = self.id.clone();
|
155
|
-
let app = self.app;
|
156
|
-
let receiver = self.receiver.clone();
|
157
|
-
let terminated = self.terminated.clone();
|
158
|
-
let scheduler_class = self.scheduler_class;
|
159
|
-
let server = self.server.clone();
|
160
|
-
call_with_gvl(|_| {
|
161
|
-
*self.thread.write() = Some(
|
162
|
-
create_ruby_thread(move || {
|
163
|
-
if let Some(scheduler_class) = scheduler_class {
|
164
|
-
if let Err(err) = Self::fiber_accept_loop(
|
165
|
-
server,
|
166
|
-
id,
|
167
|
-
app,
|
168
|
-
receiver,
|
169
|
-
scheduler_class,
|
170
|
-
terminated,
|
171
|
-
) {
|
172
|
-
error!("Error in fiber_accept_loop: {:?}", err);
|
173
|
-
}
|
174
|
-
} else {
|
175
|
-
Self::accept_loop(server, id, app, receiver, terminated);
|
176
|
-
}
|
177
|
-
})
|
178
|
-
.into(),
|
179
|
-
);
|
180
|
-
Ok::<(), magnus::Error>(())
|
181
|
-
})?;
|
182
|
-
Ok(())
|
183
|
-
}
|
184
|
-
|
185
|
-
pub fn build_scheduler_proc(
|
186
|
-
app: Opaque<Value>,
|
187
|
-
leader: &Arc<Mutex<Option<RequestJob>>>,
|
188
|
-
receiver: &Arc<async_channel::Receiver<RequestJob>>,
|
189
|
-
terminated: &Arc<AtomicBool>,
|
190
|
-
waker_sender: &watch::Sender<TerminateWakerSignal>,
|
191
|
-
oob_gc_responses_threshold: Option<u64>,
|
192
|
-
) -> magnus::block::Proc {
|
193
|
-
let leader = leader.clone();
|
194
|
-
let receiver = receiver.clone();
|
195
|
-
let terminated = terminated.clone();
|
196
|
-
let waker_sender = waker_sender.clone();
|
197
|
-
Ruby::get().unwrap().proc_from_fn(move |ruby, _args, _blk| {
|
198
|
-
let scheduler = ruby
|
199
|
-
.get_inner(&CLASS_FIBER)
|
200
|
-
.funcall::<_, _, Value>(*ID_SCHEDULER, ())
|
201
|
-
.unwrap();
|
202
|
-
let server = ruby.get_inner(&ITSI_SERVER);
|
203
|
-
let thread_current = ruby.thread_current();
|
204
|
-
let leader_clone = leader.clone();
|
205
|
-
let receiver = receiver.clone();
|
206
|
-
let terminated = terminated.clone();
|
207
|
-
let waker_sender = waker_sender.clone();
|
208
|
-
let mut batch = Vec::with_capacity(MAX_BATCH_SIZE as usize);
|
209
|
-
|
210
|
-
static MAX_BATCH_SIZE: i32 = 25;
|
211
|
-
call_without_gvl(move || loop {
|
212
|
-
let mut idle_counter = 0;
|
213
|
-
if let Some(v) = leader_clone.lock().take() {
|
214
|
-
match v {
|
215
|
-
RequestJob::ProcessRequest(itsi_request) => {
|
216
|
-
batch.push(RequestJob::ProcessRequest(itsi_request))
|
217
|
-
}
|
218
|
-
RequestJob::Shutdown => {
|
219
|
-
waker_sender.send(TerminateWakerSignal(true)).unwrap();
|
220
|
-
break;
|
221
|
-
}
|
222
|
-
}
|
223
|
-
}
|
224
|
-
for _ in 0..MAX_BATCH_SIZE {
|
225
|
-
if let Ok(req) = receiver.try_recv() {
|
226
|
-
batch.push(req);
|
227
|
-
} else {
|
228
|
-
break;
|
229
|
-
}
|
230
|
-
}
|
231
|
-
|
232
|
-
let shutdown_requested = call_with_gvl(|_| {
|
233
|
-
for req in batch.drain(..) {
|
234
|
-
match req {
|
235
|
-
RequestJob::ProcessRequest(request) => {
|
236
|
-
let response = request.response.clone();
|
237
|
-
if let Err(err) =
|
238
|
-
server.funcall::<_, _, Value>(*ID_SCHEDULE, (app, request))
|
239
|
-
{
|
240
|
-
ItsiRequest::internal_error(ruby, response, err)
|
241
|
-
}
|
242
|
-
}
|
243
|
-
RequestJob::Shutdown => return true,
|
244
|
-
}
|
245
|
-
}
|
246
|
-
false
|
247
|
-
});
|
248
|
-
|
249
|
-
if shutdown_requested || terminated.load(Ordering::Relaxed) {
|
250
|
-
waker_sender.send(TerminateWakerSignal(true)).unwrap();
|
251
|
-
break;
|
252
|
-
}
|
253
|
-
|
254
|
-
let yield_result = if receiver.is_empty() {
|
255
|
-
let should_gc = if let Some(oob_gc_threshold) = oob_gc_responses_threshold {
|
256
|
-
idle_counter = (idle_counter + 1) % oob_gc_threshold;
|
257
|
-
idle_counter == 0
|
258
|
-
} else {
|
259
|
-
false
|
260
|
-
};
|
261
|
-
waker_sender.send(TerminateWakerSignal(false)).unwrap();
|
262
|
-
call_with_gvl(|ruby| {
|
263
|
-
if should_gc {
|
264
|
-
ruby.gc_start();
|
265
|
-
}
|
266
|
-
scheduler.funcall::<_, _, Value>(*ID_BLOCK, (thread_current, None::<u8>))
|
267
|
-
})
|
268
|
-
} else {
|
269
|
-
call_with_gvl(|_| scheduler.funcall::<_, _, Value>(*ID_YIELD, ()))
|
270
|
-
};
|
271
|
-
|
272
|
-
if yield_result.is_err() {
|
273
|
-
break;
|
274
|
-
}
|
275
|
-
})
|
276
|
-
})
|
277
|
-
}
|
278
|
-
|
279
|
-
#[instrument(skip_all, fields(thread_worker=id))]
|
280
|
-
pub fn fiber_accept_loop(
|
281
|
-
server: Arc<Server>,
|
282
|
-
|
283
|
-
id: String,
|
284
|
-
app: Opaque<Value>,
|
285
|
-
receiver: Arc<async_channel::Receiver<RequestJob>>,
|
286
|
-
scheduler_class: Opaque<Value>,
|
287
|
-
terminated: Arc<AtomicBool>,
|
288
|
-
) -> Result<()> {
|
289
|
-
let ruby = Ruby::get().unwrap();
|
290
|
-
let (waker_sender, waker_receiver) = watch::channel(TerminateWakerSignal(false));
|
291
|
-
let leader: Arc<Mutex<Option<RequestJob>>> = Arc::new(Mutex::new(None));
|
292
|
-
let server_class = ruby.get_inner(&ITSI_SERVER);
|
293
|
-
let scheduler_proc = Self::build_scheduler_proc(
|
294
|
-
app,
|
295
|
-
&leader,
|
296
|
-
&receiver,
|
297
|
-
&terminated,
|
298
|
-
&waker_sender,
|
299
|
-
server.oob_gc_responses_threshold,
|
300
|
-
);
|
301
|
-
let (scheduler, scheduler_fiber) = server_class.funcall::<_, _, (Value, Value)>(
|
302
|
-
"start_scheduler_loop",
|
303
|
-
(scheduler_class, scheduler_proc),
|
304
|
-
)?;
|
305
|
-
Self::start_waker_thread(
|
306
|
-
scheduler.into(),
|
307
|
-
scheduler_fiber.into(),
|
308
|
-
leader,
|
309
|
-
receiver,
|
310
|
-
waker_receiver,
|
311
|
-
);
|
312
|
-
Ok(())
|
313
|
-
}
|
314
|
-
|
315
|
-
#[allow(clippy::await_holding_lock)]
|
316
|
-
pub fn start_waker_thread(
|
317
|
-
scheduler: Opaque<Value>,
|
318
|
-
scheduler_fiber: Opaque<Value>,
|
319
|
-
leader: Arc<Mutex<Option<RequestJob>>>,
|
320
|
-
receiver: Arc<async_channel::Receiver<RequestJob>>,
|
321
|
-
mut waker_receiver: watch::Receiver<TerminateWakerSignal>,
|
322
|
-
) {
|
323
|
-
create_ruby_thread(move || {
|
324
|
-
let scheduler = scheduler.get_inner_with(&Ruby::get().unwrap());
|
325
|
-
let leader = leader.clone();
|
326
|
-
call_without_gvl(|| {
|
327
|
-
RuntimeBuilder::new_current_thread()
|
328
|
-
.build()
|
329
|
-
.expect("Failed to build Tokio runtime")
|
330
|
-
.block_on(async {
|
331
|
-
loop {
|
332
|
-
waker_receiver.changed().await.ok();
|
333
|
-
if waker_receiver.borrow().0 {
|
334
|
-
break;
|
335
|
-
}
|
336
|
-
tokio::select! {
|
337
|
-
_ = waker_receiver.changed() => {
|
338
|
-
if waker_receiver.borrow().0 {
|
339
|
-
break;
|
340
|
-
}
|
341
|
-
},
|
342
|
-
next_msg = receiver.recv() => {
|
343
|
-
*leader.lock() = next_msg.ok();
|
344
|
-
call_with_gvl(|_| {
|
345
|
-
scheduler
|
346
|
-
.funcall::<_, _, Value>(
|
347
|
-
"unblock",
|
348
|
-
(None::<u8>, scheduler_fiber),
|
349
|
-
)
|
350
|
-
.ok();
|
351
|
-
});
|
352
|
-
}
|
353
|
-
}
|
354
|
-
}
|
355
|
-
})
|
356
|
-
});
|
357
|
-
});
|
358
|
-
}
|
359
|
-
|
360
|
-
#[instrument(skip_all, fields(thread_worker=id))]
|
361
|
-
pub fn accept_loop(
|
362
|
-
server: Arc<Server>,
|
363
|
-
id: String,
|
364
|
-
app: Opaque<Value>,
|
365
|
-
receiver: Arc<async_channel::Receiver<RequestJob>>,
|
366
|
-
terminated: Arc<AtomicBool>,
|
367
|
-
) {
|
368
|
-
let ruby = Ruby::get().unwrap();
|
369
|
-
let server_class = ruby.get_inner(&ITSI_SERVER);
|
370
|
-
let mut idle_counter = 0;
|
371
|
-
call_without_gvl(|| loop {
|
372
|
-
if receiver.is_empty() {
|
373
|
-
if let Some(oob_gc_threshold) = server.oob_gc_responses_threshold {
|
374
|
-
idle_counter = (idle_counter + 1) % oob_gc_threshold;
|
375
|
-
if idle_counter == 0 {
|
376
|
-
ruby.gc_start();
|
377
|
-
}
|
378
|
-
};
|
379
|
-
}
|
380
|
-
match receiver.recv_blocking() {
|
381
|
-
Ok(RequestJob::ProcessRequest(request)) => {
|
382
|
-
if terminated.load(Ordering::Relaxed) {
|
383
|
-
break;
|
384
|
-
}
|
385
|
-
call_with_gvl(|_ruby| {
|
386
|
-
request.process(&ruby, server_class, app).ok();
|
387
|
-
})
|
388
|
-
}
|
389
|
-
Ok(RequestJob::Shutdown) => {
|
390
|
-
debug!("Shutting down thread worker");
|
391
|
-
break;
|
392
|
-
}
|
393
|
-
Err(_) => {
|
394
|
-
thread::sleep(Duration::from_micros(1));
|
395
|
-
}
|
396
|
-
}
|
397
|
-
});
|
398
|
-
}
|
399
|
-
}
|
@@ -1,132 +0,0 @@
|
|
1
|
-
use async_trait::async_trait;
|
2
|
-
use fs2::FileExt;
|
3
|
-
use parking_lot::Mutex;
|
4
|
-
use std::fs::{self, OpenOptions};
|
5
|
-
use std::io::Error as IoError;
|
6
|
-
use std::path::{Path, PathBuf};
|
7
|
-
use tokio_rustls_acme::caches::DirCache;
|
8
|
-
use tokio_rustls_acme::{AccountCache, CertCache};
|
9
|
-
|
10
|
-
use crate::env::ITSI_ACME_LOCK_FILE_NAME;
|
11
|
-
|
12
|
-
/// A wrapper around DirCache that locks a file before writing cert/account data.
|
13
|
-
pub struct LockedDirCache<P: AsRef<Path> + Send + Sync> {
|
14
|
-
inner: DirCache<P>,
|
15
|
-
lock_path: PathBuf,
|
16
|
-
current_lock: Mutex<Option<std::fs::File>>,
|
17
|
-
}
|
18
|
-
|
19
|
-
impl<P: AsRef<Path> + Send + Sync> LockedDirCache<P> {
|
20
|
-
pub fn new(dir: P) -> Self {
|
21
|
-
let dir_path = dir.as_ref().to_path_buf();
|
22
|
-
std::fs::create_dir_all(&dir_path).unwrap();
|
23
|
-
let lock_path = dir_path.join(&*ITSI_ACME_LOCK_FILE_NAME);
|
24
|
-
Self::touch_file(&lock_path).expect("Failed to create lock file");
|
25
|
-
|
26
|
-
Self {
|
27
|
-
inner: DirCache::new(dir),
|
28
|
-
lock_path,
|
29
|
-
current_lock: Mutex::new(None),
|
30
|
-
}
|
31
|
-
}
|
32
|
-
|
33
|
-
fn touch_file(path: &PathBuf) -> std::io::Result<()> {
|
34
|
-
if let Some(parent) = path.parent() {
|
35
|
-
fs::create_dir_all(parent)?;
|
36
|
-
}
|
37
|
-
fs::OpenOptions::new()
|
38
|
-
.create(true)
|
39
|
-
.write(true)
|
40
|
-
.truncate(true)
|
41
|
-
.open(path)?;
|
42
|
-
Ok(())
|
43
|
-
}
|
44
|
-
|
45
|
-
fn lock_exclusive(&self) -> Result<(), IoError> {
|
46
|
-
if self.current_lock.lock().is_some() {
|
47
|
-
return Ok(());
|
48
|
-
}
|
49
|
-
|
50
|
-
if let Some(parent) = self.lock_path.parent() {
|
51
|
-
std::fs::create_dir_all(parent)?;
|
52
|
-
}
|
53
|
-
let lockfile = OpenOptions::new()
|
54
|
-
.create(true)
|
55
|
-
.write(true)
|
56
|
-
.truncate(true)
|
57
|
-
.open(&self.lock_path)?;
|
58
|
-
lockfile.lock_exclusive()?;
|
59
|
-
*self.current_lock.lock() = Some(lockfile);
|
60
|
-
Ok(())
|
61
|
-
}
|
62
|
-
|
63
|
-
fn unlock(&self) -> Result<(), IoError> {
|
64
|
-
self.current_lock.lock().take();
|
65
|
-
Ok(())
|
66
|
-
}
|
67
|
-
}
|
68
|
-
|
69
|
-
#[async_trait]
|
70
|
-
impl<P: AsRef<Path> + Send + Sync> CertCache for LockedDirCache<P> {
|
71
|
-
type EC = IoError;
|
72
|
-
|
73
|
-
async fn load_cert(
|
74
|
-
&self,
|
75
|
-
domains: &[String],
|
76
|
-
directory_url: &str,
|
77
|
-
) -> Result<Option<Vec<u8>>, Self::EC> {
|
78
|
-
self.lock_exclusive()?;
|
79
|
-
let result = self.inner.load_cert(domains, directory_url).await;
|
80
|
-
|
81
|
-
if let Ok(Some(_)) = result {
|
82
|
-
self.unlock()?;
|
83
|
-
}
|
84
|
-
|
85
|
-
result
|
86
|
-
}
|
87
|
-
|
88
|
-
async fn store_cert(
|
89
|
-
&self,
|
90
|
-
domains: &[String],
|
91
|
-
directory_url: &str,
|
92
|
-
cert: &[u8],
|
93
|
-
) -> Result<(), Self::EC> {
|
94
|
-
// Acquire the lock before storing
|
95
|
-
self.lock_exclusive()?;
|
96
|
-
|
97
|
-
// Perform the store operation
|
98
|
-
let result = self.inner.store_cert(domains, directory_url, cert).await;
|
99
|
-
|
100
|
-
if let Ok(()) = result {
|
101
|
-
self.unlock()?;
|
102
|
-
}
|
103
|
-
result
|
104
|
-
}
|
105
|
-
}
|
106
|
-
|
107
|
-
#[async_trait]
|
108
|
-
impl<P: AsRef<Path> + Send + Sync> AccountCache for LockedDirCache<P> {
|
109
|
-
type EA = IoError;
|
110
|
-
|
111
|
-
async fn load_account(
|
112
|
-
&self,
|
113
|
-
contact: &[String],
|
114
|
-
directory_url: &str,
|
115
|
-
) -> Result<Option<Vec<u8>>, Self::EA> {
|
116
|
-
self.lock_exclusive()?;
|
117
|
-
self.inner.load_account(contact, directory_url).await
|
118
|
-
}
|
119
|
-
|
120
|
-
async fn store_account(
|
121
|
-
&self,
|
122
|
-
contact: &[String],
|
123
|
-
directory_url: &str,
|
124
|
-
account: &[u8],
|
125
|
-
) -> Result<(), Self::EA> {
|
126
|
-
self.lock_exclusive()?;
|
127
|
-
|
128
|
-
self.inner
|
129
|
-
.store_account(contact, directory_url, account)
|
130
|
-
.await
|
131
|
-
}
|
132
|
-
}
|