zoeissleeping/flux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scaffold CLI and fix logging

Browse Source
This commit is contained in:
Zoe
2024-12-03 03:21:12 -06:00
parent 8a55c1593b
commit 9d97e11fc6
9 changed files with 329 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/server.go
View File

@@ -49,47 +49,47 @@ func NewServer() *FluxServer {
configPath := filepath.Join(rootDir, "config.json")
if _, err := os.Stat(configPath); err != nil {
if err := os.MkdirAll(rootDir, 0755); err != nil {
log.Fatalf("Failed to create fluxd directory: %v", err)
log.Fatalf("Failed to create fluxd directory: %v\n", err)
}
configBytes, err := json.Marshal(DefaultConfig)
if err != nil {
log.Fatalf("Failed to marshal default config: %v", err)
log.Fatalf("Failed to marshal default config: %v\n", err)
}
log.Printf("Config file not found, creating default config file at %s", configPath)
log.Printf("Config file not found, creating default config file at %s\n", configPath)
if err := os.WriteFile(configPath, configBytes, 0644); err != nil {
log.Fatalf("Failed to write config file: %v", err)
log.Fatalf("Failed to write config file: %v\n", err)
}
}
configFile, err := os.ReadFile(configPath)
if err != nil {
log.Fatalf("Failed to read config file: %v", err)
log.Fatalf("Failed to read config file: %v\n", err)
}
if err := json.Unmarshal(configFile, &serverConfig); err != nil {
log.Fatalf("Failed to parse config file: %v", err)
log.Fatalf("Failed to parse config file: %v\n", err)
}
if err := os.MkdirAll(filepath.Join(rootDir, "apps"), 0755); err != nil {
log.Fatalf("Failed to create apps directory: %v", err)
log.Fatalf("Failed to create apps directory: %v\n", err)
}
db, err := sql.Open("sqlite3", filepath.Join(rootDir, "fluxd.db"))
if err != nil {
log.Fatalf("Failed to open database: %v", err)
log.Fatalf("Failed to open database: %v\n", err)
}
// create database schema
schemaBytes, err := schema.ReadFile("schema.sql")
if err != nil {
log.Fatalf("Failed to read schema file: %v", err)
log.Fatalf("Failed to read schema file: %v\n", err)
}
_, err = db.Exec(string(schemaBytes))
if err != nil {
log.Fatalf("Failed to create database schema: %v", err)
log.Fatalf("Failed to create database schema: %v\n", err)
}
return &FluxServer{
@@ -102,27 +102,27 @@ func NewServer() *FluxServer {
func (s *FluxServer) UploadAppCode(code io.Reader, projectConfig ProjectConfig) (string, error) {
projectPath := filepath.Join(rootDir, "apps", projectConfig.Name)
if err := os.MkdirAll(projectPath, 0755); err != nil {
log.Printf("Failed to create project directory: %v", err)
log.Printf("Failed to create project directory: %v\n", err)
return "", err
}
gzReader, err := gzip.NewReader(code)
if err != nil {
log.Printf("Failed to create gzip reader: %v", err)
log.Printf("Failed to create gzip reader: %v\n", err)
return "", err
}
defer gzReader.Close()
tarReader := tar.NewReader(gzReader)
// Extract files
log.Printf("Extracting files for %s...\n", projectPath)
for {
header, err := tarReader.Next()
if err == io.EOF {
break
}
if err != nil {
log.Printf("Failed to read tar header: %v", err)
log.Printf("Failed to read tar header: %v\n", err)
return "", err
}
@@ -133,24 +133,24 @@ func (s *FluxServer) UploadAppCode(code io.Reader, projectConfig ProjectConfig)
switch header.Typeflag {
case tar.TypeDir:
if err := os.MkdirAll(path, 0755); err != nil {
log.Printf("Failed to extract directory: %v", err)
log.Printf("Failed to extract directory: %v\n", err)
return "", err
}
case tar.TypeReg:
if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
log.Printf("Failed to extract directory: %v", err)
log.Printf("Failed to extract directory: %v\n", err)
return "", err
}
outFile, err := os.Create(path)
if err != nil {
log.Printf("Failed to extract file: %v", err)
log.Printf("Failed to extract file: %v\n", err)
return "", err
}
defer outFile.Close()
if _, err := io.Copy(outFile, tarReader); err != nil {
log.Printf("Failed to copy file during extraction: %v", err)
log.Printf("Failed to copy file during extraction: %v\n", err)
return "", err
}
}