← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby-passenger/wily-proposed

« back to all changes in this revision

Viewing changes to ext/common/AgentsStarter.h

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-11-23 23:50:02 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20131123235002-8fdhsq7afj15o2z2
Tags: 4.0.25-1
http://bugs.debian.org/725591
* New upstream release.
* Refresh fix_install_path.patch.
* Build for Ruby 2.0 instead of 1.8. (Closes: #725591)
* Add fix_ftbfs_fortify_source.patch.
* Install passenger template files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/common/AgentsStarter.h
374
374
         */
375
375
        void start(const string &passengerRoot,
376
376
                const VariantMap &extraParams = VariantMap(),
377
 
                const function<void ()> &afterFork = function<void ()>())
 
377
                const boost::function<void ()> &afterFork = boost::function<void ()>())
378
378
        {
379
379
                TRACE_POINT();
380
380
                this_thread::disable_interruption di;
389
389
                params
390
390
                        .set    ("web_server_type", type == AS_APACHE ? "apache" : "nginx")
391
391
                        .setPid ("web_server_pid",  getpid())
 
392
                        .set    ("web_server_passenger_version", PASSENGER_VERSION)
392
393
                        .set    ("passenger_root",  passengerRoot)
393
394
                        .setInt ("log_level",       getLogLevel())
394
395
                        .set    ("temp_dir",        getSystemTempDir());
404
405
                // .set    ("default_ruby",    defaultRubyCommand)
405
406
                // .setInt ("max_pool_size",   maxPoolSize)
406
407
                // .setInt ("max_instances_per_app",     maxInstancesPerApp)
407
 
                /*
408
 
                        .setInt ("pool_idle_time",            poolIdleTime)
409
 
                        .set    ("analytics_server",          analyticsServer)
410
 
                        .set    ("analytics_log_user",        analyticsLogUser)
411
 
                        .set    ("analytics_log_group",       analyticsLogGroup)
412
 
                        .set    ("union_station_gateway_address",  unionStationGatewayAddress)
413
 
                        .setInt ("union_station_gateway_port", unionStationGatewayPort)
414
 
                        .set    ("union_station_gateway_cert", realUnionStationGatewayCert)
415
 
                        .set    ("union_station_proxy_address", unionStationProxyAddress)
416
 
                        .set    ("prestart_urls",   serializePrestartURLs(prestartURLs));
417
 
                */
418
408
                
419
409
                fds = createUnixSocketPair();
420
410
                pid = syscalls::fork();
533
523
                                requestSocketPassword   = info.get("request_socket_password");
534
524
                                helperAgentAdminSocketAddress = info.get("helper_agent_admin_socket_address");
535
525
                                helperAgentExitPassword       = info.get("helper_agent_exit_password");
536
 
                                serverInstanceDir = make_shared<ServerInstanceDir>(info.get("server_instance_dir"), false);
 
526
                                serverInstanceDir = boost::make_shared<ServerInstanceDir>(info.get("server_instance_dir"), false);
537
527
                                generation        = serverInstanceDir->getGeneration(info.getInt("generation"));
538
528
                                loggingSocketAddress  = info.get("logging_socket_address");
539
529
                                loggingSocketPassword = info.get("logging_socket_password");