Fix DLNA port, and expose them in Docker

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
master
Randomnicode 5 years ago committed by Andrew DeMaria
parent e789e531d0
commit d626463060
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 6
      airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java
  2. 9
      airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java
  3. 51
      airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
  4. 6
      install/docker/Dockerfile
  5. 1
      install/docker/run.sh

@ -210,6 +210,8 @@ public class SettingsService {
private static final Integer DEFAULT_DATABASE_MYSQL_VARCHAR_MAXLENGTH = 512;
private static final String DEFAULT_DATABASE_USERTABLE_QUOTE = null;
private static final int DEFAULT_UPNP_PORT = 4041;
// Array of obsolete keys. Used to clean property file.
private static final List<String> OBSOLETE_KEYS = Arrays.asList("PortForwardingPublicPort", "PortForwardingLocalPort",
"DownsamplingCommand", "DownsamplingCommand2", "DownsamplingCommand3", "AutoCoverBatch", "MusicMask",
@ -288,6 +290,10 @@ public class SettingsService {
return "jdbc:hsqldb:file:" + getAirsonicHome().getPath() + "/db/" + getFileSystemAppName();
}
public static int getDefaultUPnpPort() {
return Optional.ofNullable(System.getProperty("UPNP_PORT")).map(x -> Integer.parseInt(x)).orElse(DEFAULT_UPNP_PORT);
}
public static File getLogFile() {
File airsonicHome = SettingsService.getAirsonicHome();
return new File(airsonicHome, getFileSystemAppName() + ".log");

@ -19,10 +19,10 @@
*/
package org.airsonic.player.service;
import org.airsonic.player.service.upnp.ApacheUpnpServiceConfiguration;
import org.airsonic.player.service.upnp.CustomContentDirectory;
import org.airsonic.player.service.upnp.MSMediaReceiverRegistrarService;
import org.airsonic.player.util.FileUtil;
import org.fourthline.cling.DefaultUpnpServiceConfiguration;
import org.fourthline.cling.UpnpService;
import org.fourthline.cling.UpnpServiceImpl;
import org.fourthline.cling.binding.annotations.AnnotationLocalServiceBinder;
@ -61,10 +61,13 @@ public class UPnPService {
@Autowired
private SettingsService settingsService;
private UpnpService upnpService;
@Autowired
@Qualifier("dispatchingContentDirectory")
private CustomContentDirectory dispatchingContentDirectory;
private AtomicReference<Boolean> running = new AtomicReference<>(false);
@PostConstruct
@ -112,14 +115,14 @@ public class UPnPService {
try {
LOG.info("Starting UPnP service...");
createService();
LOG.info("Starting UPnP service - Done!");
LOG.info("Successfully started UPnP service on port {}!", SettingsService.getDefaultUPnpPort());
} catch (Throwable x) {
LOG.error("Failed to start UPnP service: " + x, x);
}
}
private synchronized void createService() {
upnpService = new UpnpServiceImpl(new ApacheUpnpServiceConfiguration());
upnpService = new UpnpServiceImpl(new DefaultUpnpServiceConfiguration(SettingsService.getDefaultUPnpPort()));
// Asynch search for other devices (most importantly UPnP-enabled routers for port-mapping)
upnpService.getControlPoint().search();

@ -1,51 +0,0 @@
/*
This file is part of Airsonic.
Airsonic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Airsonic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Airsonic. If not, see <http://www.gnu.org/licenses/>.
Copyright 2016 (C) Airsonic Authors
Based upon Subsonic, Copyright 2013 (C) Sindre Mehus
*/
package org.airsonic.player.service.upnp;
import org.fourthline.cling.DefaultUpnpServiceConfiguration;
import org.fourthline.cling.transport.impl.apache.StreamClientConfigurationImpl;
import org.fourthline.cling.transport.impl.apache.StreamClientImpl;
import org.fourthline.cling.transport.impl.apache.StreamServerConfigurationImpl;
import org.fourthline.cling.transport.impl.apache.StreamServerImpl;
import org.fourthline.cling.transport.spi.NetworkAddressFactory;
import org.fourthline.cling.transport.spi.StreamClient;
import org.fourthline.cling.transport.spi.StreamServer;
import java.util.concurrent.Executors;
/**
* UPnP configuration which uses Apache HttpComponents. Needed to make UPnP work
* when deploying on Tomcat.
*
* @author Sindre Mehus
* @version $Id$
*/
public class ApacheUpnpServiceConfiguration extends DefaultUpnpServiceConfiguration {
@Override
public StreamClient createStreamClient() {
return new StreamClientImpl(new StreamClientConfigurationImpl(Executors.newCachedThreadPool()));
}
@Override
public StreamServer createStreamServer(NetworkAddressFactory networkAddressFactory) {
return new StreamServerImpl(new StreamServerConfigurationImpl(networkAddressFactory.getStreamListenPort()));
}
}

@ -3,7 +3,7 @@ FROM alpine:3.9
LABEL description="Airsonic is a free, web-based media streamer, providing ubiquitious access to your music." \
url="https://github.com/airsonic/airsonic"
ENV AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic CONTEXT_PATH=/
ENV AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic CONTEXT_PATH=/ UPNP_PORT=4041
WORKDIR $AIRSONIC_DIR
@ -27,6 +27,10 @@ COPY target/dependency/airsonic-main.war airsonic.war
EXPOSE $AIRSONIC_PORT
# Default DLNA/UPnP ports
EXPOSE $UPNP_PORT
EXPOSE 1900/udp
VOLUME $AIRSONIC_DIR/data $AIRSONIC_DIR/music $AIRSONIC_DIR/playlists $AIRSONIC_DIR/podcasts
HEALTHCHECK --interval=15s --timeout=3s CMD wget -q http://localhost:"$AIRSONIC_PORT""$CONTEXT_PATH"rest/ping -O /dev/null || exit 1

@ -20,6 +20,7 @@ if [[ $# -lt 1 ]] || [[ ! "$1" == "java"* ]]; then
-Dairsonic.defaultMusicFolder=$AIRSONIC_DIR/music \
-Dairsonic.defaultPodcastFolder=$AIRSONIC_DIR/podcasts \
-Dairsonic.defaultPlaylistFolder=$AIRSONIC_DIR/playlists \
-DUPNP_PORT=$UPNP_PORT \
-Djava.awt.headless=true \
"${java_opts_array[@]}" \
-jar airsonic.war "$@"

Loading…
Cancel
Save