mirror of
https://github.com/rcourtman/Pulse.git
synced 2026-09-24 12:13:28 +00:00
fix: expand timezone list in quiet hours configuration
addresses #477 Expanded the timezone dropdown from 11 options to 70+ common IANA timezones covering all major regions (Africa, Americas, Asia, Australia, Europe, Pacific). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
rcourtman
@@ -1422,18 +1422,83 @@ function ScheduleTab(props: ScheduleTabProps) {
|
||||
props.setHasUnsavedChanges(true);
|
||||
};
|
||||
|
||||
// Comprehensive list of common IANA timezones
|
||||
const timezones = [
|
||||
'UTC',
|
||||
'America/New_York',
|
||||
// Africa
|
||||
'Africa/Cairo',
|
||||
'Africa/Johannesburg',
|
||||
'Africa/Lagos',
|
||||
'Africa/Nairobi',
|
||||
// Americas
|
||||
'America/Anchorage',
|
||||
'America/Argentina/Buenos_Aires',
|
||||
'America/Bogota',
|
||||
'America/Caracas',
|
||||
'America/Chicago',
|
||||
'America/Denver',
|
||||
'America/Halifax',
|
||||
'America/Lima',
|
||||
'America/Los_Angeles',
|
||||
'Europe/London',
|
||||
'Europe/Paris',
|
||||
'Europe/Berlin',
|
||||
'Asia/Tokyo',
|
||||
'America/Mexico_City',
|
||||
'America/New_York',
|
||||
'America/Phoenix',
|
||||
'America/Santiago',
|
||||
'America/Sao_Paulo',
|
||||
'America/St_Johns',
|
||||
'America/Toronto',
|
||||
'America/Vancouver',
|
||||
// Asia
|
||||
'Asia/Bangkok',
|
||||
'Asia/Dhaka',
|
||||
'Asia/Dubai',
|
||||
'Asia/Hong_Kong',
|
||||
'Asia/Jakarta',
|
||||
'Asia/Jerusalem',
|
||||
'Asia/Karachi',
|
||||
'Asia/Kolkata',
|
||||
'Asia/Kuala_Lumpur',
|
||||
'Asia/Manila',
|
||||
'Asia/Riyadh',
|
||||
'Asia/Seoul',
|
||||
'Asia/Shanghai',
|
||||
'Asia/Singapore',
|
||||
'Asia/Taipei',
|
||||
'Asia/Tehran',
|
||||
'Asia/Tokyo',
|
||||
// Australia
|
||||
'Australia/Adelaide',
|
||||
'Australia/Brisbane',
|
||||
'Australia/Melbourne',
|
||||
'Australia/Perth',
|
||||
'Australia/Sydney',
|
||||
// Europe
|
||||
'Europe/Amsterdam',
|
||||
'Europe/Athens',
|
||||
'Europe/Berlin',
|
||||
'Europe/Brussels',
|
||||
'Europe/Budapest',
|
||||
'Europe/Copenhagen',
|
||||
'Europe/Dublin',
|
||||
'Europe/Helsinki',
|
||||
'Europe/Istanbul',
|
||||
'Europe/Lisbon',
|
||||
'Europe/London',
|
||||
'Europe/Madrid',
|
||||
'Europe/Moscow',
|
||||
'Europe/Oslo',
|
||||
'Europe/Paris',
|
||||
'Europe/Prague',
|
||||
'Europe/Rome',
|
||||
'Europe/Stockholm',
|
||||
'Europe/Vienna',
|
||||
'Europe/Warsaw',
|
||||
'Europe/Zurich',
|
||||
// Pacific
|
||||
'Pacific/Auckland',
|
||||
'Pacific/Fiji',
|
||||
'Pacific/Guam',
|
||||
'Pacific/Honolulu',
|
||||
];
|
||||
|
||||
const days = [
|
||||
|
||||
@@ -481,6 +481,12 @@ func (m *Monitor) Start(ctx context.Context, wsHub *websocket.Hub) {
|
||||
broadcastTicker := time.NewTicker(pollingInterval)
|
||||
defer broadcastTicker.Stop()
|
||||
|
||||
// Start connection retry mechanism for failed clients
|
||||
// This handles cases where network/Proxmox isn't ready on initial startup
|
||||
if !mock.IsMockEnabled() {
|
||||
go m.retryFailedConnections(ctx)
|
||||
}
|
||||
|
||||
// Do an immediate poll on start (only if not in mock mode)
|
||||
if mock.IsMockEnabled() {
|
||||
log.Info().Msg("Mock mode enabled - skipping real node polling")
|
||||
@@ -521,6 +527,176 @@ func (m *Monitor) Start(ctx context.Context, wsHub *websocket.Hub) {
|
||||
}
|
||||
}
|
||||
|
||||
// retryFailedConnections attempts to recreate clients that failed during initialization
|
||||
// This handles cases where Proxmox/network isn't ready when Pulse starts
|
||||
func (m *Monitor) retryFailedConnections(ctx context.Context) {
|
||||
// Retry schedule: 5s, 10s, 20s, 40s, 60s, then every 60s for up to 5 minutes total
|
||||
retryDelays := []time.Duration{
|
||||
5 * time.Second,
|
||||
10 * time.Second,
|
||||
20 * time.Second,
|
||||
40 * time.Second,
|
||||
60 * time.Second,
|
||||
}
|
||||
|
||||
maxRetryDuration := 5 * time.Minute
|
||||
startTime := time.Now()
|
||||
retryIndex := 0
|
||||
|
||||
for {
|
||||
// Stop retrying after max duration or if context is cancelled
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
default:
|
||||
}
|
||||
|
||||
if time.Since(startTime) > maxRetryDuration {
|
||||
log.Info().Msg("Connection retry period expired")
|
||||
return
|
||||
}
|
||||
|
||||
// Calculate next retry delay
|
||||
var delay time.Duration
|
||||
if retryIndex < len(retryDelays) {
|
||||
delay = retryDelays[retryIndex]
|
||||
retryIndex++
|
||||
} else {
|
||||
delay = 60 * time.Second // Continue retrying every 60s
|
||||
}
|
||||
|
||||
// Wait before retry
|
||||
select {
|
||||
case <-time.After(delay):
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
|
||||
// Check for missing clients and try to recreate them
|
||||
m.mu.Lock()
|
||||
missingPVE := []config.PVEInstance{}
|
||||
missingPBS := []config.PBSInstance{}
|
||||
|
||||
// Find PVE instances without clients
|
||||
for _, pve := range m.config.PVEInstances {
|
||||
if _, exists := m.pveClients[pve.Name]; !exists {
|
||||
missingPVE = append(missingPVE, pve)
|
||||
}
|
||||
}
|
||||
|
||||
// Find PBS instances without clients
|
||||
for _, pbs := range m.config.PBSInstances {
|
||||
if _, exists := m.pbsClients[pbs.Name]; !exists {
|
||||
missingPBS = append(missingPBS, pbs)
|
||||
}
|
||||
}
|
||||
m.mu.Unlock()
|
||||
|
||||
// If no missing clients, we're done
|
||||
if len(missingPVE) == 0 && len(missingPBS) == 0 {
|
||||
log.Info().Msg("All client connections established successfully")
|
||||
return
|
||||
}
|
||||
|
||||
log.Info().
|
||||
Int("missingPVE", len(missingPVE)).
|
||||
Int("missingPBS", len(missingPBS)).
|
||||
Dur("nextRetry", delay).
|
||||
Msg("Attempting to reconnect failed clients")
|
||||
|
||||
// Try to recreate PVE clients
|
||||
for _, pve := range missingPVE {
|
||||
if pve.IsCluster && len(pve.ClusterEndpoints) > 0 {
|
||||
// Create cluster client
|
||||
hasValidEndpoints := false
|
||||
endpoints := make([]string, 0, len(pve.ClusterEndpoints))
|
||||
|
||||
for _, ep := range pve.ClusterEndpoints {
|
||||
host := ep.IP
|
||||
if host == "" {
|
||||
host = ep.Host
|
||||
}
|
||||
if host == "" {
|
||||
continue
|
||||
}
|
||||
if strings.Contains(host, ".") || net.ParseIP(host) != nil {
|
||||
hasValidEndpoints = true
|
||||
}
|
||||
if !strings.HasPrefix(host, "http") {
|
||||
host = fmt.Sprintf("https://%s:8006", host)
|
||||
}
|
||||
endpoints = append(endpoints, host)
|
||||
}
|
||||
|
||||
if !hasValidEndpoints || len(endpoints) == 0 {
|
||||
endpoints = []string{pve.Host}
|
||||
if !strings.HasPrefix(endpoints[0], "http") {
|
||||
endpoints[0] = fmt.Sprintf("https://%s:8006", endpoints[0])
|
||||
}
|
||||
}
|
||||
|
||||
clientConfig := config.CreateProxmoxConfig(&pve)
|
||||
clientConfig.Timeout = m.config.ConnectionTimeout
|
||||
clusterClient := proxmox.NewClusterClient(pve.Name, clientConfig, endpoints)
|
||||
|
||||
m.mu.Lock()
|
||||
m.pveClients[pve.Name] = clusterClient
|
||||
m.state.SetConnectionHealth(pve.Name, true)
|
||||
m.mu.Unlock()
|
||||
|
||||
log.Info().
|
||||
Str("instance", pve.Name).
|
||||
Str("cluster", pve.ClusterName).
|
||||
Msg("Successfully reconnected cluster client")
|
||||
} else {
|
||||
// Create regular client
|
||||
clientConfig := config.CreateProxmoxConfig(&pve)
|
||||
clientConfig.Timeout = m.config.ConnectionTimeout
|
||||
client, err := proxmox.NewClient(clientConfig)
|
||||
if err != nil {
|
||||
log.Warn().
|
||||
Err(err).
|
||||
Str("instance", pve.Name).
|
||||
Msg("Failed to reconnect PVE client, will retry")
|
||||
continue
|
||||
}
|
||||
|
||||
m.mu.Lock()
|
||||
m.pveClients[pve.Name] = client
|
||||
m.state.SetConnectionHealth(pve.Name, true)
|
||||
m.mu.Unlock()
|
||||
|
||||
log.Info().
|
||||
Str("instance", pve.Name).
|
||||
Msg("Successfully reconnected PVE client")
|
||||
}
|
||||
}
|
||||
|
||||
// Try to recreate PBS clients
|
||||
for _, pbsInst := range missingPBS {
|
||||
clientConfig := config.CreatePBSConfig(&pbsInst)
|
||||
clientConfig.Timeout = 60 * time.Second
|
||||
client, err := pbs.NewClient(clientConfig)
|
||||
if err != nil {
|
||||
log.Warn().
|
||||
Err(err).
|
||||
Str("instance", pbsInst.Name).
|
||||
Msg("Failed to reconnect PBS client, will retry")
|
||||
continue
|
||||
}
|
||||
|
||||
m.mu.Lock()
|
||||
m.pbsClients[pbsInst.Name] = client
|
||||
m.state.SetConnectionHealth("pbs-"+pbsInst.Name, true)
|
||||
m.mu.Unlock()
|
||||
|
||||
log.Info().
|
||||
Str("instance", pbsInst.Name).
|
||||
Msg("Successfully reconnected PBS client")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// poll fetches data from all configured instances
|
||||
func (m *Monitor) poll(ctx context.Context, wsHub *websocket.Hub) {
|
||||
// Limit concurrent polls to 2 to prevent resource exhaustion
|
||||
|
||||
Reference in New Issue
Block a user