Ticket #4811: MythTV.pm.diff

File MythTV.pm.diff, 2.1 KB (added by eharris@…, 16 years ago)

Unified diff to add support to override master settings

  • MythTV.pm

    old new  
    139139            elsif ($var eq 'LocalHostName') {
    140140                $mysql_conf{'hostname'} = $val;
    141141            }
     142        # Master server overrides
     143            elsif ($var eq 'MasterServerIP') {
     144                $mysql_conf{'master_host'} = $val;
     145            }
     146            elsif ($var eq 'MasterServerPort') {
     147                $mysql_conf{'master_port'} = $val;
     148            }
    142149        }
    143150        close CONF;
    144151    }
    … …  
    152159                     'db_pass'     => $mysql_conf{'db_pass'},
    153160                     'db_name'     => $mysql_conf{'db_name'},
    154161                     'hostname'    => $mysql_conf{'hostname'},
    155                      'master_host' => undef,
    156                      'master_port' => undef,
     162                     'master_host' => $mysql_conf{'master_host'},
     163                     'master_port' => $mysql_conf{'master_port'},
    157164                     'dbh'         => undef,
    158165
    159166                     'channels'    => {},
    … …  
    171178            $self->{'db_pass'}  = $params->{'db_pass'}  if ($params->{'db_pass'});
    172179            $self->{'db_name'}  = $params->{'db_name'}  if ($params->{'db_name'});
    173180            $self->{'hostname'} = $params->{'hostname'} if ($params->{'hostname'});
     181            $self->{'master_host'} = $params->{'master_host'} if ($params->{'master_host'});
     182            $self->{'master_port'} = $params->{'master_port'} if ($params->{'master_port'});
    174183        }
    175184
    176185    # No db config?
    … …  
    186195            or die "Cannot connect to database: $!\n\n";
    187196
    188197    # Load the master host and port
    189         $self->{'master_host'} = $self->backend_setting('MasterServerIP');
    190         $self->{'master_port'} = $self->backend_setting('MasterServerPort');
     198        if (!$self->{'master_host'}) {
     199            $self->{'master_host'} = $self->backend_setting('MasterServerIP');
     200        }
     201        if (!$self->{'master_port'}) {
     202            $self->{'master_port'} = $self->backend_setting('MasterServerPort');
     203        }
    191204
    192205        if (!$self->{'master_host'} || !$self->{'master_port'}) {
    193206            die "MasterServerIP or MasterServerPort not found!\n"