Software /
code /
prosody
Comparison
core/portmanager.lua @ 4617:d8e56e6ac8d4
portmanager: Remove check for service_info.multiplex (now implemented in mod_net_multiplex)
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 15 Mar 2012 03:02:36 +0000 |
parent | 4616:03d9fe1bcdd3 |
child | 4618:1ec8122ddffe |
comparison
equal
deleted
inserted
replaced
4616:03d9fe1bcdd3 | 4617:d8e56e6ac8d4 |
---|---|
97 end | 97 end |
98 end | 98 end |
99 | 99 |
100 for interface in bind_interfaces do | 100 for interface in bind_interfaces do |
101 for port in bind_ports do | 101 for port in bind_ports do |
102 if not service_info.multiplex and #active_services:search(nil, interface, port) > 0 then | 102 if #active_services:search(nil, interface, port) > 0 then |
103 log("error", "Multiple services configured to listen on the same port ([%s]:%d): %s, %s", interface, port, active_services:search(nil, interface, port)[1][1].service.name or "<unnamed>", service_name or "<unnamed>"); | 103 log("error", "Multiple services configured to listen on the same port ([%s]:%d): %s, %s", interface, port, active_services:search(nil, interface, port)[1][1].service.name or "<unnamed>", service_name or "<unnamed>"); |
104 else | 104 else |
105 local handler, err = server.addserver(interface, port, listener, mode, ssl); | 105 local handler, err = server.addserver(interface, port, listener, mode, ssl); |
106 if not handler then | 106 if not handler then |
107 log("error", "Failed to open server port %d on %s, %s", port, interface, error_to_friendly_message(service_name, port, err)); | 107 log("error", "Failed to open server port %d on %s, %s", port, interface, error_to_friendly_message(service_name, port, err)); |