A fork of Gitea (see branch `mj`) adding Majority Judgment Polls 𐄷 over Issues and Merge Requests. https://git.mieuxvoter.fr
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

198 lines
5.2 KiB

9 years ago
9 years ago
9 years ago
9 years ago
9 years ago
Add a storage layer for attachments (#11387) * Add a storage layer for attachments * Fix some bug * fix test * Fix copyright head and lint * Fix bug * Add setting for minio and flags for migrate-storage * Add documents * fix lint * Add test for minio store type on attachments * fix test * fix test * Apply suggestions from code review Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> * Add warning when storage migrated successfully * Fix drone * fix test * rebase * Fix test * display the error on console * Move minio test to amd64 since minio docker don't support arm64 * refactor the codes * add trace * Fix test * remove log on xorm * Fi download bug * Add a storage layer for attachments * Add setting for minio and flags for migrate-storage * fix lint * Add test for minio store type on attachments * Apply suggestions from code review Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> * Fix drone * fix test * Fix test * display the error on console * Move minio test to amd64 since minio docker don't support arm64 * refactor the codes * add trace * Fix test * Add URL function to serve attachments directly from S3/Minio * Add ability to enable/disable redirection in attachment configuration * Fix typo * Add a storage layer for attachments * Add setting for minio and flags for migrate-storage * fix lint * Add test for minio store type on attachments * Apply suggestions from code review Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> * Fix drone * fix test * Fix test * display the error on console * Move minio test to amd64 since minio docker don't support arm64 * don't change unrelated files * Fix lint * Fix build * update go.mod and go.sum * Use github.com/minio/minio-go/v6 * Remove unused function * Upgrade minio to v7 and some other improvements * fix lint * Fix go mod Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: Tyler <tystuyfzand@gmail.com>
2 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
4 years ago
9 years ago
  1. // Copyright 2014 The Gogs Authors. All rights reserved.
  2. // Copyright 2016 The Gitea Authors. All rights reserved.
  3. // Use of this source code is governed by a MIT-style
  4. // license that can be found in the LICENSE file.
  5. // Gitea (git with a cup of tea) is a painless self-hosted Git Service.
  6. package main // import "code.gitea.io/gitea"
  7. import (
  8. "fmt"
  9. "os"
  10. "runtime"
  11. "strings"
  12. "time"
  13. "code.gitea.io/gitea/cmd"
  14. "code.gitea.io/gitea/modules/log"
  15. "code.gitea.io/gitea/modules/setting"
  16. // register supported doc types
  17. _ "code.gitea.io/gitea/modules/markup/csv"
  18. _ "code.gitea.io/gitea/modules/markup/markdown"
  19. _ "code.gitea.io/gitea/modules/markup/orgmode"
  20. "github.com/urfave/cli"
  21. )
  22. var (
  23. // Version holds the current Gitea version
  24. Version = "development"
  25. // Tags holds the build tags used
  26. Tags = ""
  27. // MakeVersion holds the current Make version if built with make
  28. MakeVersion = ""
  29. originalAppHelpTemplate = ""
  30. originalCommandHelpTemplate = ""
  31. originalSubcommandHelpTemplate = ""
  32. )
  33. func init() {
  34. setting.AppVer = Version
  35. setting.AppBuiltWith = formatBuiltWith()
  36. setting.AppStartTime = time.Now().UTC()
  37. // Grab the original help templates
  38. originalAppHelpTemplate = cli.AppHelpTemplate
  39. originalCommandHelpTemplate = cli.CommandHelpTemplate
  40. originalSubcommandHelpTemplate = cli.SubcommandHelpTemplate
  41. }
  42. func main() {
  43. app := cli.NewApp()
  44. app.Name = "Gitea"
  45. app.Usage = "A painless self-hosted Git service"
  46. app.Description = `By default, gitea will start serving using the webserver with no
  47. arguments - which can alternatively be run by running the subcommand web.`
  48. app.Version = Version + formatBuiltWith()
  49. app.Commands = []cli.Command{
  50. cmd.CmdWeb,
  51. cmd.CmdServ,
  52. cmd.CmdHook,
  53. cmd.CmdDump,
  54. cmd.CmdCert,
  55. cmd.CmdAdmin,
  56. cmd.CmdGenerate,
  57. cmd.CmdMigrate,
  58. cmd.CmdKeys,
  59. cmd.CmdConvert,
  60. cmd.CmdDoctor,
  61. cmd.CmdManager,
  62. cmd.Cmdembedded,
  63. cmd.CmdMigrateStorage,
  64. cmd.CmdDocs,
  65. cmd.CmdDumpRepository,
  66. cmd.CmdRestoreRepository,
  67. }
  68. // Now adjust these commands to add our global configuration options
  69. // First calculate the default paths and set the AppHelpTemplates in this context
  70. setting.SetCustomPathAndConf("", "", "")
  71. setAppHelpTemplates()
  72. // default configuration flags
  73. defaultFlags := []cli.Flag{
  74. cli.StringFlag{
  75. Name: "custom-path, C",
  76. Value: setting.CustomPath,
  77. Usage: "Custom path file path",
  78. },
  79. cli.StringFlag{
  80. Name: "config, c",
  81. Value: setting.CustomConf,
  82. Usage: "Custom configuration file path",
  83. },
  84. cli.VersionFlag,
  85. cli.StringFlag{
  86. Name: "work-path, w",
  87. Value: setting.AppWorkPath,
  88. Usage: "Set the gitea working path",
  89. },
  90. }
  91. // Set the default to be equivalent to cmdWeb and add the default flags
  92. app.Flags = append(app.Flags, cmd.CmdWeb.Flags...)
  93. app.Flags = append(app.Flags, defaultFlags...)
  94. app.Action = cmd.CmdWeb.Action
  95. // Add functions to set these paths and these flags to the commands
  96. app.Before = establishCustomPath
  97. for i := range app.Commands {
  98. setFlagsAndBeforeOnSubcommands(&app.Commands[i], defaultFlags, establishCustomPath)
  99. }
  100. err := app.Run(os.Args)
  101. if err != nil {
  102. log.Fatal("Failed to run app with %s: %v", os.Args, err)
  103. }
  104. }
  105. func setFlagsAndBeforeOnSubcommands(command *cli.Command, defaultFlags []cli.Flag, before cli.BeforeFunc) {
  106. command.Flags = append(command.Flags, defaultFlags...)
  107. command.Before = establishCustomPath
  108. for i := range command.Subcommands {
  109. setFlagsAndBeforeOnSubcommands(&command.Subcommands[i], defaultFlags, before)
  110. }
  111. }
  112. func establishCustomPath(ctx *cli.Context) error {
  113. var providedCustom string
  114. var providedConf string
  115. var providedWorkPath string
  116. currentCtx := ctx
  117. for {
  118. if len(providedCustom) != 0 && len(providedConf) != 0 && len(providedWorkPath) != 0 {
  119. break
  120. }
  121. if currentCtx == nil {
  122. break
  123. }
  124. if currentCtx.IsSet("custom-path") && len(providedCustom) == 0 {
  125. providedCustom = currentCtx.String("custom-path")
  126. }
  127. if currentCtx.IsSet("config") && len(providedConf) == 0 {
  128. providedConf = currentCtx.String("config")
  129. }
  130. if currentCtx.IsSet("work-path") && len(providedWorkPath) == 0 {
  131. providedWorkPath = currentCtx.String("work-path")
  132. }
  133. currentCtx = currentCtx.Parent()
  134. }
  135. setting.SetCustomPathAndConf(providedCustom, providedConf, providedWorkPath)
  136. setAppHelpTemplates()
  137. if ctx.IsSet("version") {
  138. cli.ShowVersion(ctx)
  139. os.Exit(0)
  140. }
  141. return nil
  142. }
  143. func setAppHelpTemplates() {
  144. cli.AppHelpTemplate = adjustHelpTemplate(originalAppHelpTemplate)
  145. cli.CommandHelpTemplate = adjustHelpTemplate(originalCommandHelpTemplate)
  146. cli.SubcommandHelpTemplate = adjustHelpTemplate(originalSubcommandHelpTemplate)
  147. }
  148. func adjustHelpTemplate(originalTemplate string) string {
  149. overrided := ""
  150. if _, ok := os.LookupEnv("GITEA_CUSTOM"); ok {
  151. overrided = "(GITEA_CUSTOM)"
  152. }
  153. return fmt.Sprintf(`%s
  154. DEFAULT CONFIGURATION:
  155. CustomPath: %s %s
  156. CustomConf: %s
  157. AppPath: %s
  158. AppWorkPath: %s
  159. `, originalTemplate, setting.CustomPath, overrided, setting.CustomConf, setting.AppPath, setting.AppWorkPath)
  160. }
  161. func formatBuiltWith() string {
  162. var version = runtime.Version()
  163. if len(MakeVersion) > 0 {
  164. version = MakeVersion + ", " + runtime.Version()
  165. }
  166. if len(Tags) == 0 {
  167. return " built with " + version
  168. }
  169. return " built with " + version + " : " + strings.ReplaceAll(Tags, " ", ", ")
  170. }